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
@@ -1,576 +1,496 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation>Celé jméno</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Kontakt</translation>
     </message>
     <message>
         <source>Pick</source>
         <translation>Výběr</translation>
     </message>
 </context>
 <context>
     <name>AbView</name>
     <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>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation>Vybraný soubor 
 nemá koncovku &quot;.vcf&quot;. 
 Opravdu ho chcete otevřít?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Ano</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;Ne</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>Přidat kontakt?</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <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>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Nelze uložit informace. 
 Uvolněte nějaké místo 
 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>
         <translation>Klikněte na záložku pro její výběr</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Ostatní</translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation>Nastavení hledání</translation>
     </message>
     <message>
         <source>Query Style</source>
         <translation>Styl dotazu</translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation>Nastavení pro styl dotazu hledání</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>Použít regulární výrazy</translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation>Hledací okno očekává regulární výrazy</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>Použít hvězdičky (*,?)</translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
         <translation>Hledací okno očekává jednoduchou hvězdičkovou konvenci</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Rozlišovat velikost</translation>
     </message>
     <message>
         <source>If selected, search differs between upper and lower chars</source>
         <translation>Hledání bude rozlišovat mezi velkými a malými písmeny</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Písmo</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Malé</translation>
     </message>
     <message>
         <source>Font size for list- and card view</source>
         <translation>Velikost písma pro zobrazení seznamu a karty</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normální</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Velké</translation>
     </message>
     <message>
         <source>Tool-/Menubar</source>
         <translation>Lišta nástrojů/menu</translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation>Fixní</translation>
     </message>
     <message>
         <source>Switch to fixed menu-/toolbars after restarting application !</source>
         <translation>Aktivujte pro fixní lišty menu a nástrojů po restartu aplikace!</translation>
     </message>
     <message>
         <source>Moveable</source>
         <translation>Posunovatelné</translation>
     </message>
     <message>
         <source>Switch to moveable menu-/toolbars after restarting application !</source>
         <translation>Aktivujte pro posunovatelné lišty menu a nástrojů po restartu aplikace!</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Pošta</translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
         <translation>Nastavení písma pro zobrazení seznamu a karty</translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation>Upřednostnit QT-Mail </translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation>Použít mail program Sharpu, pokud je k dispozici</translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation>Použít Opie-Mail</translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</source>
         <translation>Použít OPIE mail, pokud je nainstalován</translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation>Upozornění: QT-Mail je 
 poskytován v SHARP 
 výchozí ROM. Opie-Mail 
 je poskytován zdarma!
 </translation>
     </message>
     <message>
         <source>Order</source>
         <translation>Řazení</translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation>Vyberte řazení kontaktů:</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Nahoru</translation>
     </message>
     <message>
         <source>Move selected attribute one line up</source>
         <translation>Posune vybraný atribut o řádku nahoru</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Dolů</translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation>Posune vybraný atribut o řádku dolů</translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation>Seznam všech dostupných atributů</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Přidat</translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation>Přidat vybraný atribut ze seznamu dole do horního seznamu</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Odstranit</translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation>Odstranit vybraný atribut z horního seznamu</translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation>Řazení (nahoru -&gt; dolů) definuje primární zobrazení kontaktů v druhém sloupci seznamu</translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Full Name...</source>
         <translation>Celé jméno...</translation>
     </message>
     <message>
         <source>Press to enter last- middle and firstname</source>
         <translation>Vložte příjmení střední a křestní jméno</translation>
     </message>
     <message>
         <source>Enter fullname directly ! If you have a lastname with multiple words ( for instance &quot;de la Guerra&quot;), please write &lt;lastname&gt;,&lt;firstnames&gt; like this: &quot;de la Guerra, Carlos Pedro&quot;</source>
         <translation>Zadejte přímo celé jméno! Pokud máte příjmení z více slov ( například &quot;de la Guerra&quot;), prosím napište &lt;příjmení&gt;,&lt;jméno&gt; takto: &quot;de la Guerra, Carlos Pedro&quot;</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Název pracovní pozice</translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation>Název prac. pozice..</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Přípona</translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation>Něco jako &quot;jr.&quot;..</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Organizace</translation>
     </message>
     <message>
         <source>The working place of the contact</source>
         <translation>Pracovní pozice kontaktu</translation>
     </message>
     <message>
         <source>Press to select attribute to change</source>
         <translation>Vyberte atribut, který chcete změnit</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Soubor jako</translation>
     </message>
     <message>
         <source>Press to select how to store the name (and howto show it in the listview)</source>
         <translation>Vyberte, jak chcete uložit jméno (a jak se bude zobrazovat v seznamu)</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Poznámky...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Hlavní</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Obchodní</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Domácí</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Adresa</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Město</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Stát</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>Směrovací číslo</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>Země</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>Spojené státy</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Spojené království</translation>
     </message>
     <message>
         <source>Afghanistan</source>
         <translation>Afghánistán</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation>Albánie</translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation>Alžírsko</translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation>Americká Samoa</translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation>Andorra</translation>
     </message>
     <message>
         <source>Angola</source>
         <translation>Angola</translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Antarctica</source>
         <translation>Antarktika</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>Argentina</translation>
     </message>
     <message>
         <source>Armenia</source>
         <translation>Arménie</translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Australia</source>
         <translation>Austrálie</translation>
     </message>
     <message>
         <source>Austria</source>
         <translation>Rakousko</translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation>Ázerbajdžán</translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation>Bahamy</translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation>Bahrajn</translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation>Bangladéš</translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation>Barbados</translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation>Bělorusko</translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation>Belgie</translation>
     </message>
     <message>
         <source>Belize</source>
         <translation>Belize</translation>
     </message>
     <message>
         <source>Benin</source>
         <translation>Benin</translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation>Bermudy</translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation>Bhútán</translation>
     </message>
     <message>
         <source>Bolivia</source>
         <translation>Bolívie</translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation>Botswana</translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation type="unfinished"></translation>
     </message>
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
@@ -1,450 +1,359 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AdvancedFm</name>
     <message>
         <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>
         <source>Open as text</source>
         <translation>Otevřít jako text</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Akce</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>Vytvořit adresář</translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation>Vytvořit symbolický link</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Přejmenovat</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Kopírovat</translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation>Kopírovat jako</translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation>Kopírovat stejný adresář</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>Přesunout</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Smazat</translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation>Přidat do dokumentů</translation>
     </message>
     <message>
         <source>Run Command</source>
         <translation>Spustit příkaz</translation>
     </message>
     <message>
         <source>File Info</source>
         <translation>Info o souboru</translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation>Nastavení práv</translation>
     </message>
     <message>
         <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>
         <source>Run Command with Output</source>
         <translation>Spustit příkaz s výstupem</translation>
     </message>
     <message>
         <source>Select All</source>
         <translation>Vybrat vše</translation>
     </message>
     <message>
         <source>Switch to View 1</source>
         <translation>Přepnout do 1. okna</translation>
     </message>
     <message>
         <source>Switch to View 2</source>
         <translation>Přepnout do 2. okna</translation>
     </message>
     <message>
         <source>Bookmark Directory</source>
         <translation>Adresář do záložek</translation>
     </message>
     <message>
         <source>Remove Current Directory from Bookmarks</source>
         <translation>Odstranit aktuální adresář ze záložek</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Velikost</translation>
     </message>
     <message>
         <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>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>Nelze přejmenovat</translation>
     </message>
     <message>
         <source>Not Yet Implemented</source>
         <translation>Nebylo ještě implementováno</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 does not exist&lt;/p&gt;</source>
         <translation>&lt;p&gt;%1 neexistuje&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;Držitel práv na Advanced FileManager 2002-2003 je L.J.Potter&lt;llornkcor@handhelds.org&gt; a je licencován pod 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;Nelze odstranit aktuální adresář ze záložek. Není mezi záložkami!&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Refresh</source>
         <translation>Obnovit</translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1 files?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Opravdu smazat souborů?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1 and all it&apos;s contents?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Opravdu smazat %1 a všechen jeho obsah?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Opravdu smazat %1?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Really copy %1 files?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Opravdu kopírovat %1 souborů?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 already  exists. Ok to overwrite?&lt;/P&gt;</source>
         <translation>&lt;p&gt;%1 už  existuje. Chcete ho přepsat?&lt;/P&gt;</translation>
     </message>
     <message>
         <source>&lt;P&gt;Could not copy %1 to %2&lt;/P&gt;</source>
         <translation>&lt;P&gt;Nelze kopírovat %1 do %2&lt;/P&gt;</translation>
     </message>
     <message>
         <source>Copy %1 As</source>
         <translation>Kopírovat %1 jako</translation>
     </message>
     <message>
         <source>&lt;P&gt; %1 already exists. Ok to overwrite?&lt;/p&gt;</source>
         <translation>&lt;P&gt;%1 už  existuje. Chcete ho přepsat?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not copy %1 to %2&lt;/P&gt;</source>
         <translation>&lt;p&gt;Nelze kopírovat %1 do %2&lt;/P&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt; %1 already exists. Do you really want to delete it?&lt;/P&gt;</source>
         <translation>&lt;p&gt;%1 už  existuje. Opravdu ho chcete smazat?&lt;/P&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not move %1&lt;/p&gt;</source>
         <translation>&lt;p&gt;Nelze přesunout %1&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not copy %1 to %2&lt;/p&gt;</source>
         <translation>&lt;p&gt;Nelze kopírovat %1 do %2&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Output</source>
         <translation>Výstup</translation>
     </message>
     <message>
         <source>Process could not start</source>
         <translation>Proces se nemůže spustit</translation>
     </message>
     <message>
         <source>Error
 </source>
         <translation>Chyba</translation>
     </message>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Uložit výstup do souboru (jen jméno)</translation>
     </message>
     <message>
         <source>
 Finished
 </source>
         <translation>
 Dokončeno</translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>filePermissions</source>
         <translation>Práva souborů</translation>
     </message>
     <message>
         <source>Set File Permissions</source>
         <translation>Nastavit práva souborů</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>nastavit práva souboru pro:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>vlastník</translation>
     </message>
     <message>
         <source>group</source>
         <translation>skupina</translation>
     </message>
     <message>
         <source>others</source>
         <translation>ostatní</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Vlastník</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Skupina</translation>
     </message>
     <message>
         <source>read</source>
         <translation>čtení</translation>
     </message>
     <message>
         <source>write</source>
         <translation>zápis</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>spouštění</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Varování</translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation>Chyba- není uživatel</translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation>Chyba- není skupina</translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation>Chyba nastavení vlastíka, nebo skupiny</translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation>Chyba nastavení režimu</translation>
     </message>
 </context>
 </TS>
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
@@ -1,277 +1,233 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Appearance</name>
     <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>Styly zajišťují, jak budou vypadat tlačítka a posuvníky ve všech aplikacích. 
 
 Klikněte sem pro výběr jednoho ze stylů.</translation>
     </message>
     <message>
         <source>Settings...</source>
         <translation>Nastavení...</translation>
     </message>
     <message>
         <source>Click here to configure the currently selected style.
 
 Note:  This option is not available for all styles.</source>
         <translation>Klikněte sem pro konfiguraci aktuálně označeného stylu. 
 
 Poznámka: Tato volba není k dispozici pro všechny styly.</translation>
     </message>
     <message>
         <source>Window decorations control the way the application title bar and its buttons appear.
 
 Click here to select an available decoration.</source>
         <translation>Dekorace oken řídí zobrazování lišty a jejích tlačítek. 
 
 Klikněte sem pro výběr možných dekorací.</translation>
     </message>
     <message>
         <source>Select the desired name, style and size of the default font applications will use.</source>
         <translation>Vyberte požadovaný název, styl a velikost výchozího písma pro aplikace.</translation>
     </message>
     <message>
         <source>Color schemes are a collection of colors which are used for various parts of the display.
 
 Click here to select an available scheme.</source>
         <translation>Barevná schémata jsou kolekce barev, které jsou požívané pro různé části zobrazení. 
 
 Klikněte sem pro výběr požadovaného schéma.</translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation>Aktuální schéma</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>Upravit...</translation>
     </message>
     <message>
         <source>Click here to change the colors in the current color scheme.</source>
         <translation>Klikněte sem pro změnu barev v aktálním barevném schéma.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Smazat</translation>
     </message>
     <message>
         <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: 
 
 1. Záložky - normální záložky pouze s textovými popiskami 
 2. Záložky s ikonami - Záložky s ikonami na každé záložce a s textem pouze na otevřené 
 3. Rolovací menu - vertikální seznam záložek 
 4. Rolovací menu s ikonami - vertikální seznam záložek s ikonami</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Záložky</translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
         <translation>Záložky s ikonami</translation>
     </message>
     <message>
         <source>Drop down list</source>
         <translation>Rolovací menu</translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation>Rolovací menu s ikonami</translation>
     </message>
     <message>
         <source>Top</source>
         <translation>Nahoře</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation>Po zaškrtnutí se budou záložky objevovat v horní části okna.</translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation>Dole</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation>Po zaškrtnutí se budou záložky objevovat v dolní části okna.</translation>
     </message>
     <message>
         <source>Rotation direction:</source>
         <translation>Směr rotace:</translation>
     </message>
     <message>
         <source>Appearance Settings</source>
         <translation>Nastavení vzhledu</translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation>Toto je okno náhledu.  Zde uvidíte změny ve vzhledu, jak budete měnit vlastnosti.</translation>
     </message>
     <message>
         <source>Style</source>
         <translation>Styl</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Písmo</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Barvy</translation>
     </message>
     <message>
         <source>Windows</source>
         <translation>Okna</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Rozšířené</translation>
     </message>
     <message>
         <source>Save Scheme</source>
         <translation>Uložit Schéma</translation>
     </message>
     <message>
         <source>Save scheme</source>
         <translation>Uložit schéma</translation>
     </message>
     <message>
         <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>
         <translation>Upravit schéma</translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation>Kliknutím vyberte barvu pro:</translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
         <translation>Vzorek</translation>
     </message>
     <message>
         <source>Normal Item</source>
         <translation>Normální položka</translation>
     </message>
     <message>
         <source>Disabled Item</source>
         <translation>Vypnutá položka</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Menu</translation>
     </message>
     <message>
         <source>Normal Text</source>
         <translation>Normální text</translation>
     </message>
     <message>
         <source>Highlighted Text</source>
         <translation>Zvýrazněný text</translation>
     </message>
     <message>
         <source>Button</source>
         <translation>Tlačítko</translation>
     </message>
     <message>
         <source>Check Box</source>
         <translation>Zaškrtávátko</translation>
     </message>
     <message>
         <source>Sample window using the selected settings.</source>
         <translation>Vzorové okno používá vybrané nastavení.</translation>
     </message>
 </context>
 </TS>
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
@@ -7,676 +7,664 @@
     </message>
     <message>
         <source>Select one or more groups</source>
         <translation>Vyberte jednu, nebo více skupin</translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation>Načítám konfiguraci...</translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Storno</translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Remove
 </source>
         <translation>Odstranit</translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation>Instalovat</translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation>Aktualizovat</translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation>(Přeinstalovat)</translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation>(Aktualizovat)</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation>Cíl</translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation>Volné místo</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Výstup</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Start</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Možnosti</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Vše</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Text</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation>Přerušit</translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation>
 **** Uživatel stisknul PŘERUŠIT ***</translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation>**** Proces přerušen ****</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Zavřít</translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation>%1 Kb</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Neznámý</translation>
     </message>
     <message>
         <source>Save output</source>
         <translation>Uložit výstup</translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation>Možnosti</translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation>Přemoci závislosti</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation>Vynutit přeinstalování</translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation>Vynutit odstranění</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation>Vynutit přepsání</translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation>Informační úroveň</translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation>Pouze chyby</translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation>Normální zprávy</translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation>Informativní zprávy</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation>Výstup při hledání chyb</translation>
     </message>
 </context>
 <context>
     <name>Ipkg</name>
     <message>
         <source>Dealing with package %1</source>
         <translation>Pracuji s balíčkem %1</translation>
     </message>
     <message>
         <source>Removing symbolic links...
 </source>
         <translation>Odstraňuji symbolické linky...</translation>
     </message>
     <message>
         <source>Creating symbolic links for %1.</source>
         <translation>Vytvářím symbolické linky pro %1.</translation>
     </message>
     <message>
         <source>Creating symbolic links for %1</source>
         <translation>Vytvářím symbolické linky pro %1</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>Hotovo</translation>
     </message>
     <message>
         <source>Removing status entry...</source>
         <translation>Odstraňuji položku stavu...</translation>
     </message>
     <message>
         <source>status file - </source>
         <translation>soubor stavu - 
 </translation>
     </message>
     <message>
         <source>package - </source>
         <translation>balíček - 
 </translation>
     </message>
     <message>
         <source>Couldn&apos;t open status file - </source>
         <translation>Nelze otevřít soubor stavu - 
 </translation>
     </message>
     <message>
         <source>Couldn&apos;t create tempory status file - </source>
         <translation>Nelze vytvořit dočasný soubor stavu - 
 </translation>
     </message>
     <message>
         <source>Couldn&apos;t start ipkg process</source>
         <translation>Nelze spustit ipkg proces</translation>
     </message>
     <message>
         <source>Couldn&apos;t start ipkg-link process</source>
         <translation>Nelze spustit ipkg-link proces</translation>
     </message>
     <message>
         <source>Symbolic linking failed!
 </source>
         <translation>Vytvoření symbolického linku selhalo!</translation>
     </message>
     <message>
         <source>Symbolic linking succeeded.
 </source>
         <translation>Vytvoření symbolického linku proběhlo.</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation>AQPkg - Správce balíčků</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation>Sem zadejte text, co chcete hledat.</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation>Klikněte pro skrytí lišty rychlého přístupu.</translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation>Aktualizovat seznamy</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation>Klikněte sem pro aktualizaci seznamu balíčků ze serverů.</translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation>Aktualizovat</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation>Klikněte sem pro aktualizaci všech instalovaných balíčků, pokud je k dispozici nová verze.</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Stáhnout</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation>Klikněte sem pro stažení aktuálně označených balíčků.</translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation>Aplikovat změny</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation>Klikněte sem pro instalaci, odstranění, nebo aktualizaci vybraných balíčků.</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Konfigurovat</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation>Klikněte sem pro konfiguraci této aplikace.</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Akce</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation>Zobrazit nenainstalované balíčky</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation>Klikněte sem pro zobrazení možných balíčků, které nejsou nainstalovány.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation>Zobrazit nainstalované balíčky</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation>Klikněte sem pro zobrazení nainstalovaných balíčků.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation>Zobrazit aktualizované balíčky</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation>Klikněte sem pro zobrazení nainstalovaných balíčků, které maji k dispozici novou verzi.</translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation>Filtrovat dle kategorie</translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation>Klikněte sem pro seznam balíčků patřící do jedné kategorie.</translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation>Nastavit kategorii filtru</translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation>Klikněte sem pro změnu kategorie balíčků pro použití filtrem.</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Hledat</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation>Klikněte sem pro hledání textu v názvech balíčků.</translation>
     </message>
     <message>
         <source>Find next</source>
         <translation>Hledat další</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation>Klikněte sem pro hledání dalšího názvu balíčku obsahujícího hledaný text.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation>Panel rychlých voleb</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation>Klikněte sem pro zobrazení/skrytí panelu umožňujícího rychlé přesuny v seznamu balíčků.</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Zobrazit</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation>Klikněte sem pro skrytí vyhledávací lišty.</translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation>Servery:</translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation>Klikněte sem pro výběr zdroje balíčků.</translation>
     </message>
     <message>
         <source>Packages</source>
         <translation>Balíčky</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 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>Toto je seznam všech balíčků pro serverové zdroje vybrané nahoře. 
 
 Modrá tečka vedle jména balíčku označuje, že je balíček nainstalován. 
 
 Modrá tečka s hvězdičkou označuje, že je k dispozici novější verze balíčku v serverových zdrojích. 
 
 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 
 NENÍ doporučena! 
 
 Jste si jisti?</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Varování</translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
         <translation>Aktualizuji nainstalované balíčky</translation>
     </message>
     <message>
         <source>Are you sure you wish to delete
 %1?</source>
         <translation>Opravdu si přejete smazat
 %1?</translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation>Jste si jisti?</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Ne</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Ano</translation>
     </message>
     <message>
         <source>Download to where</source>
         <translation>Kam stáhnout</translation>
     </message>
     <message>
         <source>Enter path to download to</source>
         <translation>Vložte cestu, kam stáhnout</translation>
     </message>
     <message>
         <source>Install Remote Package</source>
         <translation>Instalovat vzdálený balíček</translation>
     </message>
     <message>
         <source>Enter package location</source>
         <translation>Zadejte umístění balíčku</translation>
     </message>
     <message>
         <source>Nothing to do</source>
         <translation>Nic k práci</translation>
     </message>
     <message>
         <source>No packages selected</source>
         <translation>Nebyl vybrán žádný balíček</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Do you wish to remove or reinstall
 %1?</source>
         <translation>Opravdu chcete odstranit, nebo přeinstalovat
 %1?</translation>
     </message>
     <message>
         <source>Remove or ReInstall</source>
         <translation>Odstranit, nebo přeinstalovat</translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation>Přeinstalovat</translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation>Opravdu chcete odstranit, nebo aktualizovat
 %1?</translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation>Odstranit, nebo aktualizovat</translation>
     </message>
     <message>
         <source>Updating Launcher...</source>
         <translation>Aktualizuji spouštěč...</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation>Vytvářím seznam serverů:
 <byte value="x9"/>%1</translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation>Vytvářím seznam balíčků pro:
 <byte value="x9"/>%1</translation>
     </message>
 </context>
 <context>
     <name>PackageWindow</name>
     <message>
         <source>&lt;b&gt;Description&lt;/b&gt; - </source>
         <translation>&lt;b&gt;Popis&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Instalováno na&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Velikost&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Sekce&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Jméno souboru&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Instalovaná verze&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Verze k dispozici&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>Package Information</source>
         <translation>Informace o balíčku</translation>
     </message>
     <message>
         <source>Package information is unavailable</source>
         <translation>Informace o balíčku není k dispozici</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Zavřít</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Installed packages</source>
         <translation>Nainstalované balíčky</translation>
     </message>
     <message>
         <source>Local packages</source>
         <translation>Lokální balíčky</translation>
     </message>
     <message>
         <source>N/A</source>
         <translation>N/A</translation>
     </message>
     <message>
         <source>Package - %1
               version - %2</source>
         <translation>Balíček - %1
               verze - %2</translation>
     </message>
     <message>
         <source>
               inst version - %1</source>
         <translation>
               inst. verze - %1</translation>
     </message>
     <message>
         <source>Version string is empty.</source>
         <translation>Verze není uvedena.</translation>
     </message>
     <message>
         <source>Epoch in version is not number.</source>
         <translation>Doba ve verzi není číslo.</translation>
     </message>
     <message>
         <source>Nothing after colon in version number.</source>
         <translation>Není nic po dvojtečce v čísle verze.</translation>
     </message>
 </context>
 <context>
     <name>QuestionDlg</name>
     <message>
         <source>Remove</source>
         <translation>Odstranit</translation>
     </message>
 </context>
 <context>
     <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation>Konfigurace</translation>
     </message>
     <message>
         <source>Servers</source>
         <translation>Servery</translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation>Cíle</translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation>Proxy</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nový</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Smazat</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Jméno:</translation>
     </message>
     <message>
         <source>Address:</source>
         <translation>Adresa:</translation>
     </message>
     <message>
         <source>Active Server</source>
         <translation>Aktivní server</translation>
     </message>
     <message>
         <source>Update</source>
         <translation>Obnovit</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation>Cíl</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Umístění:</translation>
     </message>
     <message>
         <source>Link to root</source>
         <translation>Link do rootu</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
         <translation>HTTP Proxy</translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation>Zapnuto</translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation>FTP Proxy</translation>
     </message>
     <message>
         <source>Username:</source>
         <translation>Uživ. jméno:</translation>
     </message>
     <message>
         <source>Password:</source>
         <translation>Heslo:</translation>
     </message>
 </context>
 </TS>
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,176 +1,148 @@
 <!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>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Podrobnosti</translation>
     </message>
     <message>
         <source>Backup and Restore.. Failed !!</source>
         <translation>Backup and Restore.. Se nezdařilo !!</translation>
     </message>
     <message>
         <source>Backup Successful.</source>
         <translation>Zálohování proběhlo úspěšně.</translation>
     </message>
     <message>
         <source>Backup and Restore</source>
         <translation>Backup and Restore</translation>
     </message>
     <message>
         <source>Please select something to restore.</source>
         <translation>Prosím vyberte, co chcete obnovit.</translation>
     </message>
     <message>
         <source>Restore Failed.</source>
         <translation>Obnovení selhalo.</translation>
     </message>
     <message>
         <source>Unable to open File: %1</source>
         <translation>Nemohu otevřít soubor: %1</translation>
     </message>
     <message>
         <source>Restore Successful.</source>
         <translation>Obnovení proběhlo úspěšně.</translation>
     </message>
     <message>
         <source>Backing up...</source>
         <translation>Zálohuji...</translation>
     </message>
     <message>
         <source>Restore Backup...</source>
         <translation>Obnovuji zálohu...</translation>
     </message>
     <message>
         <source>&lt;qt&gt;%1&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;%1&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation>Obnovit</translation>
     </message>
     <message>
         <source>Would you really overwrite your local data?</source>
         <translation>Opravdu chcete přepsat vaše lokální data?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Ano</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Ne</translation>
     </message>
 </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>
         <source>Column 1</source>
         <translation>Sloupec 1</translation>
     </message>
     <message>
         <source>&amp;Restore</source>
         <translation>&amp;Obnovit</translation>
     </message>
     <message>
         <source>Select Source</source>
         <translation>Vyberte zdroj</translation>
     </message>
     <message>
         <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>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
 </context>
 </TS>
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
@@ -1,187 +1,175 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BacDialog</name>
     <message>
         <source>Blood Alcohol Estimator</source>
         <translation>Kalkulátor alkoholu v krvi</translation>
     </message>
     <message>
         <source># Drinks Consumed</source>
         <translation># konzumovaných nápojů</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation>Váha</translation>
     </message>
     <message>
         <source>Kilos</source>
         <translation>Kilo</translation>
     </message>
     <message>
         <source>Pounds</source>
         <translation>Liber</translation>
     </message>
     <message>
         <source>Units</source>
         <translation>Jednotek</translation>
     </message>
     <message>
         <source>Period of Time (hours)</source>
         <translation>Doba (hodin)</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Muž</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Žena</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Neznámý</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Pohlaví</translation>
     </message>
     <message>
         <source>Beer</source>
         <translation>Pivo</translation>
     </message>
     <message>
         <source>Wine</source>
         <translation>Víno</translation>
     </message>
     <message>
         <source>Shot</source>
         <translation>Panák</translation>
     </message>
     <message>
         <source>Type of drink</source>
         <translation>Typ nápoje</translation>
     </message>
     <message>
         <source>Calculate</source>
         <translation>Spočítat</translation>
     </message>
 </context>
 <context>
     <name>Bartender</name>
     <message>
         <source>Bartender</source>
         <translation>Barman</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Soubor</translation>
     </message>
     <message>
         <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>
         <source>Name of Drink</source>
         <translation>Název nápoje</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Poznámka</translation>
     </message>
     <message>
         <source>Drink database not opened sucessfully.
 </source>
         <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>
     <message>
         <source>Edit Drink</source>
         <translation>Upravit nápoj</translation>
     </message>
     <message>
         <source>Failed to write to drink database!
 </source>
         <translation>Nemohu zapsat do databáze nápojů!
 </translation>
     </message>
     <message>
         <source>Ingredient</source>
         <translation>Ingredience</translation>
     </message>
 </context>
 <context>
     <name>New_Drink</name>
     <message>
         <source>Name</source>
         <translation>Jméno</translation>
     </message>
     <message>
         <source>Ingredients</source>
         <translation>Ingredience</translation>
     </message>
 </context>
 <context>
     <name>Show_Drink</name>
     <message>
         <source>Edit</source>
         <translation>Upravit</translation>
     </message>
 </context>
 </TS>
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,335 +1,331 @@
 <!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>
         <source>CE</source>
         <translation>CE</translation>
     </message>
     <message>
         <source>log</source>
         <translation>log</translation>
     </message>
     <message>
         <source>ln</source>
         <translation>ln</translation>
     </message>
     <message>
         <source>(</source>
         <translation>(</translation>
     </message>
     <message>
         <source>)</source>
         <translation>)</translation>
     </message>
     <message>
         <source>sin</source>
         <translation>sin</translation>
     </message>
     <message>
         <source>cos</source>
         <translation>cos</translation>
     </message>
     <message>
         <source>tan</source>
         <translation>tan</translation>
     </message>
     <message>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
         <source>+/-</source>
         <translation>+/-</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>=</source>
         <translation>=</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>.</source>
         <translation>.</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Calculator</source>
         <translation>Kalkulačka</translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Standard</source>
         <translation>Standard</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Standard</source>
         <translation>Standard</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation>Váhy</translation>
     </message>
     <message>
         <source>Distance</source>
         <translation>Vzdálenost</translation>
     </message>
     <message>
         <source>Area</source>
         <translation>Prostor</translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation>Teploty</translation>
     </message>
     <message>
         <source>Volume</source>
         <translation>Hlasitost</translation>
     </message>
     <message>
         <source>acres</source>
         <translation>akry</translation>
     </message>
     <message>
         <source>&#xb0;C</source>
         <translation>°C</translation>
     </message>
     <message>
         <source>carats</source>
         <translation>karáty</translation>
     </message>
     <message>
         <source>cm</source>
         <translation>cm</translation>
     </message>
     <message>
         <source>cu cm</source>
         <translation>cu cm</translation>
     </message>
     <message>
         <source>cu ft</source>
         <translation>cu ft</translation>
     </message>
     <message>
         <source>cu in</source>
         <translation>cu in</translation>
     </message>
     <message>
         <source>&#xb0;F</source>
         <translation>°F</translation>
     </message>
     <message>
         <source>fl oz (US)</source>
         <translation>fl oz (US)</translation>
     </message>
     <message>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
         <source>g</source>
         <translation>g</translation>
     </message>
     <message>
         <source>gal (US)</source>
         <translation>gal (US)</translation>
     </message>
     <message>
         <source>hectares</source>
         <translation>hektary</translation>
     </message>
     <message>
         <source>in</source>
         <translation>in</translation>
     </message>
     <message>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
         <source>km</source>
         <translation>km</translation>
     </message>
     <message>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
         <source>lb</source>
         <translation>lb</translation>
     </message>
     <message>
         <source>Lg tons</source>
         <translation>Lg tuny</translation>
     </message>
     <message>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
         <source>mg</source>
         <translation>mg</translation>
     </message>
     <message>
         <source>mi</source>
         <translation>mi</translation>
     </message>
     <message>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
         <source>mm</source>
         <translation>mm</translation>
     </message>
     <message>
         <source>naut. mi</source>
         <translation>námořní mi</translation>
     </message>
     <message>
         <source>oz</source>
         <translation>oz</translation>
     </message>
     <message>
         <source>points</source>
         <translation>body</translation>
     </message>
     <message>
         <source>pt</source>
         <translation>pt</translation>
     </message>
     <message>
         <source>qt</source>
         <translation>qt</translation>
     </message>
     <message>
         <source>sq cm</source>
         <translation>sq cm</translation>
     </message>
     <message>
         <source>sq ft</source>
         <translation>sq ft</translation>
     </message>
     <message>
         <source>sq in</source>
         <translation>sq in</translation>
     </message>
     <message>
         <source>sq km</source>
         <translation>sq km</translation>
     </message>
     <message>
         <source>sq m</source>
         <translation>sq m</translation>
     </message>
     <message>
         <source>sq mi</source>
         <translation>sq mi</translation>
     </message>
     <message>
         <source>sq mm</source>
         <translation>sq mm</translation>
     </message>
     <message>
         <source>sq yd</source>
         <translation>sq yd</translation>
     </message>
     <message>
         <source>st</source>
         <translation>st</translation>
     </message>
     <message>
         <source>St tons</source>
         <translation>St tuny</translation>
     </message>
     <message>
         <source>tblspoon</source>
         <translation>tblspoon</translation>
     </message>
     <message>
         <source>teaspoons</source>
         <translation>teaspoons</translation>
     </message>
     <message>
         <source>tonnes</source>
         <translation>tonnes</translation>
     </message>
     <message>
         <source>yd</source>
         <translation>yd</translation>
     </message>
 </context>
 </TS>
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
@@ -1,728 +1,736 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation>Kalendář</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nový</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>Dnes</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Den</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Týden</translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation>Týdny</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Měsíc</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Hledat</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>Upravit...</translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation>Délka trvání události je možná delší,
 než interval mezi opakováními.</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Nelze upravit dat, synchronizuje se</translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation>Duplikátní událost</translation>
     </message>
     <message>
         <source>error box</source>
         <translation>chybový rámeček</translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation>Opravit to</translation>
     </message>
     <message>
         <source>Continue</source>
         <translation>Pokračovat</translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation>Upravit událost</translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation>minut)</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Došlo místo</translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation>Kalendář nemůže zapsat vaše
 změny.
 Uvolněte místo a zkuste to znovu.
 
 Chcete přesto skončit?</translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation>(Neznámý)</translation>
     </message>
     <message>
         <source>Error!</source>
         <translation>Chyba!</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation>P</translation>
     </message>
     <message>
         <source>T</source>
         <translation>Ú</translation>
     </message>
     <message>
         <source>W</source>
         <translation>S</translation>
     </message>
     <message>
         <source>F</source>
         <translation>P</translation>
     </message>
     <message>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Pondělí</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Úterý</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Středa</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Čtvrtek</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Pátek</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sobota</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Neděle</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00p</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Toto je každodenní událost.</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Začátek</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Konec</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Čas</translation>
     </message>
     <message>
         <source> - </source>
         <translation>-</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Upravit</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplikovat</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Smazat</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Poslat</translation>
     </message>
     <message>
         <source>Beam this occurence</source>
         <translation>Poslat tuto událost</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>Calendar</source>
         <translation>Kalendář</translation>
     </message>
     <message>
         <source>:00 PM</source>
         <translation>:00 PM</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation>:00 AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>Nastavení</translation>
     </message>
     <message>
         <source>Views</source>
         <translation>Zobrazení</translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation>Výchozí zobrazení:</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Den</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Týden</translation>
     </message>
     <message>
         <source>Week List</source>
         <translation>Týdny</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Měsíc</translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation>Skočit na aktuální čas</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>Řádkový styl:</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Výchozí</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Střední</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Velký</translation>
     </message>
     <message>
         <source>Time display</source>
         <translation>Zobrazení času</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Žádný</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Začátek</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation>Začátek-Konec</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Ostatní</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation>Nastavení alarmu</translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation>Přednastavení alarmu</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>minut</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation>Začátek zobrazení událostí</translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation>Čas začátku:</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Výchozí</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Lokalita:</translation>
     </message>
     <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>
         <translation>w</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Led-00. Led</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
         <translation>PÚSČPSNP</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstEvent</name>
     <message>
         <source>Edit</source>
         <translation>Upravit</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplikovat</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Smazat</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Poslat</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>w</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>W: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation>p</translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Start Time</source>
         <translation>Čas začátku</translation>
     </message>
     <message>
         <source>End Time</source>
         <translation>Čas konce</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Kalendář</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>Opakovat...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>Denně...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>Týdně...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>Měsíčně...</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>Ročně...</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Neopakovat...</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>Nová událost</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Lokalita</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Schůzka</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Oběd</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Večeře</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Cesta</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Popis</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Kancelář</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Domov</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>Začátek-Konec</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>Led 02 00</translation>
     </message>
     <message>
         <source>Start time</source>
         <translation>Čas začátku</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Každý den</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Časové pásmo</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Alarm</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>minut</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Tichý</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Hlasitý</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Opakovat</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Neopakovat...</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Poznámka...</translation>
     </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Upravit poznámku</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Oběd</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Začátek</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Konec</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Každý</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 každý</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>%1 každý</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation> %1 %1 každého</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Každé</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Pondělí</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Úterý</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Středa</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Čtvrtek</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Pátek</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sobota</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Neděle</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>.</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>.</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>.</translation>
     </message>
     <message>
         <source>th</source>
         <translation>.</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation>Neopakovat</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>dnů</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>týdnů</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Opakovat dle</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dne</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>měsíce</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>let</translation>
     </message>
     <message>
         <source>days</source>
         <translation>dny</translation>
     </message>
     <message>
         <source>day</source>
         <translation>den</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>týdny</translation>
     </message>
     <message>
         <source>week</source>
         <translation>týden</translation>
     </message>
     <message>
         <source>month</source>
         <translation>měsíc</translation>
     </message>
     <message>
         <source>year</source>
         <translation>rok</translation>
     </message>
     <message>
         <source> and </source>
         <translation>a</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
 a </translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, a </translation>
     </message>
     <message>
         <source>on </source>
         <translation>v </translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Opakující se událost</translation>
     </message>
     <message>
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
@@ -1,56 +1,52 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GoMainWidget</name>
     <message>
         <source>New Game</source>
         <translation>Nová hra</translation>
     </message>
     <message>
         <source>Pass</source>
         <translation>Nehrát</translation>
     </message>
     <message>
         <source>Resign</source>
         <translation>Vzdát</translation>
     </message>
     <message>
         <source>Two player option</source>
         <translation>Možnosti pro dva hráče</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Hra</translation>
     </message>
 </context>
 <context>
     <name>GoWidget</name>
     <message>
         <source>White %1, Black %2. </source>
         <translation>Bílý %1, Černý %2.</translation>
     </message>
     <message>
         <source>White wins.</source>
         <translation>Bílý vyhrál.</translation>
     </message>
     <message>
         <source>Black wins.</source>
         <translation>Černý vyhrál.</translation>
     </message>
     <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
@@ -1,459 +1,455 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Edit_Title</name>
     <message>
         <source>Edit Title</source>
         <translation>Upravit název</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Storno</translation>
     </message>
     <message>
         <source>Apply</source>
         <translation>Použít</translation>
     </message>
 </context>
 <context>
     <name>FontDialog</name>
     <message>
         <source>Font Dialog</source>
         <translation>Okno písma</translation>
     </message>
     <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>
         <translation>Opravdu chcete stáhnout nejnovější
 index knihovny Projektu Gutenberg?
 nebo vybrat ftp místo?</translation>
     </message>
     <message>
         <source>&amp;Library Index</source>
         <translation>&amp;Index knihovny</translation>
     </message>
     <message>
         <source>&amp;Ftp Site</source>
         <translation>&amp;Ftp místo</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Storno</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Poznámka</translation>
     </message>
     <message>
         <source>Etext Search</source>
         <translation>Hledání Etextu</translation>
     </message>
     <message>
         <source>Please install unzip</source>
         <translation>Prosím nainstalujte unzip</translation>
     </message>
     <message>
         <source>Gutenberg Library</source>
         <translation>Knihovna Gutenberg</translation>
     </message>
     <message>
         <source>Gutenbrowser</source>
         <translation>Gutenbrowser</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Otevřít</translation>
     </message>
     <message>
         <source>Search google.com</source>
         <translation>Hledat v google.com</translation>
     </message>
     <message>
         <source>Edit Title</source>
         <translation>Upravit název</translation>
     </message>
     <message>
         <source>Please install unzip in your PATH</source>
         <translation>Prosím nainstalujte unzip do vaší cesty</translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation>Stahuji Gutenberg Index....</translation>
     </message>
 </context>
 <context>
     <name>HelpMe</name>
     <message>
         <source>Based on gutenbook.pl, available from http://www.gutenbook.org</source>
         <translation>Založeno na gutenbook.pl, k dispozici z http://www.gutenbook.org</translation>
     </message>
     <message>
         <source>Much appreciation to Lee Burgess,</source>
         <translation>Mnoho díků Lee Burgess,</translation>
     </message>
     <message>
         <source>for the original idea and concept of gutenbook.
 </source>
         <translation>za originální nápad a koncept gutenbook.</translation>
     </message>
     <message>
         <source>A list of current Gutenberg ftp sites is at http://promo.net/pg/index.html
 </source>
         <translation>Seznam aktuálních Gutenberg ftp míst je na http://promo.net/pg/index.html</translation>
     </message>
     <message>
         <source>For bug reports, comments or questions about Gutenbrowser, email</source>
         <translation>Pro hlášení chyb, komentáře, nebo otázky k Gutenbrowseru mailujte</translation>
     </message>
     <message>
         <source>ljp@llornkcor.com
 </source>
         <translation>ljp@llornkcor.com</translation>
     </message>
     <message>
         <source>
 Made using Qt, Qt Embedded, and Qtopia, a cross platform development API
 http://www.trolltech.com
 
 </source>
         <translation>
 Vyrobeno s použitím Qt, Qt Embedded, a Qtopia, cross platform vývojové API
 http://www.trolltech.com
 </translation>
     </message>
     <message>
         <source>Arnold&apos;s Laws of Documentation:</source>
         <translation>Arnoldovy zákony dokumentace:</translation>
     </message>
     <message>
         <source>(1) If it should exist, it doesn&apos;t.</source>
         <translation>(1) Pokud by měla existovat, tak neexistuje.</translation>
     </message>
     <message>
         <source>(2) If it does exist, it&apos;s out of date.</source>
         <translation>(2) Jestliže existuje, tak je zastaralá.</translation>
     </message>
     <message>
         <source>(3) Only documentation for</source>
         <translation>(3) Jen dokumentace pro</translation>
     </message>
     <message>
         <source>useless programs transcends the</source>
         <translation>nepoužitelné programy předstihne</translation>
     </message>
     <message>
         <source>first two laws.
 </source>
         <translation>první dva zákony.</translation>
     </message>
     <message>
         <source>Everything is temporary, anyway....
  :o)</source>
         <translation>Vše je dočasné v každém případě....
  :o)</translation>
     </message>
 </context>
 <context>
     <name>HelpWindow</name>
     <message>
         <source>&amp;Open File</source>
         <translation>&amp;Otevřít soubor</translation>
     </message>
     <message>
         <source>&amp;Close</source>
         <translation>&amp;Zavřít</translation>
     </message>
     <message>
         <source>&amp;Backward</source>
         <translation>&amp;Zpět</translation>
     </message>
     <message>
         <source>&amp;Forward</source>
         <translation>&amp;Vpřed</translation>
     </message>
     <message>
         <source>&amp;Home</source>
         <translation>&amp;Domů</translation>
     </message>
     <message>
         <source>Add Bookmark</source>
         <translation>Přidat záložku</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Soubor</translation>
     </message>
     <message>
         <source>&amp;Go</source>
         <translation>&amp;Jdi</translation>
     </message>
     <message>
         <source>History</source>
         <translation>Historie</translation>
     </message>
     <message>
         <source>Bookmarks</source>
         <translation>Záložky</translation>
     </message>
     <message>
         <source>Backward</source>
         <translation>Zpět</translation>
     </message>
     <message>
         <source>Forward</source>
         <translation>Vpřed</translation>
     </message>
     <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>
         <source>Title</source>
         <translation>Titul</translation>
     </message>
     <message>
         <source>Author</source>
         <translation>Autor</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Rok</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Soubor</translation>
     </message>
     <message>
         <source>A-F</source>
         <translation>A-F</translation>
     </message>
     <message>
         <source>G-M</source>
         <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>
         <translation>Poslední jméno první 
 (vyžaduje restart knihovny)</translation>
     </message>
     <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>
         <source>&amp;Cancel</source>
         <translation>&amp;Storno</translation>
     </message>
 </context>
 <context>
     <name>OpenEtext</name>
     <message>
         <source>All</source>
         <translation>Vše</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Text</translation>
     </message>
     <message>
         <source>Remove Etext</source>
         <translation>Odstranit Etext</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Ano</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Storno</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Sea&amp;rch</source>
         <translation>Hle&amp;dat</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Storno</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Rozlišovat velikost</translation>
     </message>
 </context>
 <context>
     <name>SearchResultsDlg</name>
     <message>
         <source>Search Results</source>
         <translation>Výsledky hledání</translation>
     </message>
     <message>
         <source>&amp;Download</source>
         <translation>&amp;Stáhnout</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Storno</translation>
     </message>
 </context>
 <context>
     <name>optionsDialog</name>
     <message>
         <source>Opera</source>
         <translation>Opera</translation>
     </message>
     <message>
         <source>Konqueror</source>
         <translation>Konqueror</translation>
     </message>
     <message>
         <source>wget</source>
         <translation>wget</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Vše</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Text</translation>
     </message>
     <message>
         <source>Downloading ftp sites....</source>
         <translation>Stahuji ftp místa...</translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation>Spouštím wget</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Poznámka</translation>
     </message>
     <message>
         <source>ftpSiteDlg</source>
         <translation>ftpmístoDlg</translation>
     </message>
     <message>
         <source>List File not opened sucessfully.</source>
         <translation>Nepodařilo se otevřít soubor seznamu.</translation>
     </message>
     <message>
         <source>File not opened sucessfully.</source>
         <translation>Soubor není úspěšně otevřen.</translation>
     </message>
     <message>
         <source>Main</source>
         <translation>Hlavní</translation>
     </message>
     <message>
         <source>FTP</source>
         <translation>FTP</translation>
     </message>
     <message>
         <source>http://sailor.gutenberg.org</source>
         <translation>http://sailor.gutenberg.org</translation>
     </message>
     <message>
         <source>http://www.prairienet.org/pg</source>
         <translation>http://www.prairienet.org/pg</translation>
     </message>
     <message>
         <source>HTTP</source>
         <translation>HTTP</translation>
     </message>
     <message>
         <source>Gutenbrowser Options</source>
         <translation>Gutenbrowser možnosti</translation>
     </message>
 </context>
 </TS>
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
@@ -1,246 +1,250 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Keys</name>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Výchozí</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Storno</translation>
     </message>
     <message>
         <source>Change Direction Keys</source>
         <translation>Změnit směrové klávesy</translation>
     </message>
     <message>
         <source>Undefined key</source>
         <translation>Nedefinovaná klávesa</translation>
     </message>
 </context>
 <context>
     <name>Kpacman</name>
     <message>
         <source>KPacman</source>
         <translation>KPacman</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Nový</translation>
     </message>
     <message>
         <source>&amp;Pause</source>
         <translation>&amp;Pauza</translation>
     </message>
     <message>
         <source>&amp;Hall of fame</source>
         <translation>&amp;Dvorana slávy</translation>
     </message>
     <message>
         <source>&amp;Quit</source>
         <translation>&amp;Ukončit</translation>
     </message>
     <message>
         <source>&amp;Hide Mousecursor</source>
         <translation>&amp;Skrýt ukazatel myši</translation>
     </message>
     <message>
         <source>&amp;Select graphic scheme</source>
         <translation>&amp;Vybrat grafické schéma</translation>
     </message>
     <message>
         <source>&amp;Pause in Background</source>
         <translation>&amp;Pauznout na pozadí</translation>
     </message>
     <message>
         <source>&amp;Continue in Foreground</source>
         <translation>&amp;Pokračovat na popředí</translation>
     </message>
     <message>
         <source>Change &amp;keys...</source>
         <translation>Změnit &amp;klávesy...</translation>
     </message>
     <message>
         <source>@PACKAGE@ - @VERSION@
 
 Joerg Thoennissen (joe@dsite.de)
 
 A pacman game for the KDE Desktop
 
 The program based on the source of ksnake
 by Michel Filippi (mfilippi@sade.rhein-main.de).
 The design was strongly influenced by the pacman
 (c) 1980 MIDWAY MFG.CO.
 
 I like to thank my girlfriend Elke Krueers for
 the last 10 years of her friendship.
 </source>
         <translation>@PACKAGE@ - @VERSION@
 
 Joerg Thoennissen (joe@dsite.de)
 
 Hra Pacman pro KDE Desktop
 
 Program je založen na zdrojovém kódu hry ksnake
 od Michel Filippi (mfilippi@sade.rhein-main.de).
 Design je značně ovlivněn hrou pacman
 (c) 1980 MIDWAY MFG.CO.
 
 Chci poděkovat mé přítelkyni Elke Krueers
 za 10 let našeho přátelství.
 </translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Nápověda</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>Bitfont nelze sestavit.
 
 Soubor &apos;@FONTNAME@&apos; neexistuje,
 nebo má neznámý formát.</translation>
     </message>
 </context>
 <context>
     <name>Referee</name>
     <message>
         <source>GAME  OVER</source>
         <translation>KONEC HRY</translation>
     </message>
     <message>
         <source>PLAYER ONE</source>
         <translation>HRÁČ 1</translation>
     </message>
     <message>
         <source>READY!</source>
         <translation>PŘIPRAVEN!</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>PAUZA</translation>
     </message>
     <message>
         <source>CHARACTER</source>
         <translation>POSTAVA</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>NICKNAME</source>
         <translation>PŘEZDÍVKA</translation>
     </message>
     <message>
         <source>-SHADOW</source>
         <translation>-SHADOW</translation>
     </message>
     <message>
         <source>&quot;BLINKY&quot;</source>
         <translation>&quot;BLINKY&quot;</translation>
     </message>
     <message>
         <source>-SPEEDY</source>
         <translation>-SPEEDY</translation>
     </message>
     <message>
         <source>&quot;PINKY&quot;</source>
         <translation>&quot;PINKY&quot;</translation>
     </message>
     <message>
         <source>-BASHFUL</source>
         <translation>-BASHFUL</translation>
     </message>
     <message>
         <source>&quot;INKY&quot;</source>
         <translation>&quot;INKY&quot;</translation>
     </message>
     <message>
         <source>-POKEY</source>
         <translation>-POKEY</translation>
     </message>
     <message>
         <source>&quot;CLYDE&quot;</source>
         <translation>&quot;CLYDE&quot;</translation>
     </message>
     <message>
         <source>QTOPIA PORT: CATALIN CLIMOV</source>
         <translation>QTOPIA PORT: CATALIN CLIMOV</translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
         <translation>PRO START STISKNĚTE KURZOR</translation>
     </message>
 </context>
 <context>
     <name>Score</name>
     <message>
         <source>  1UP </source>
         <translation>1HR</translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
         <translation>SKÓRE</translation>
     </message>
     <message>
         <source>  2UP </source>
         <translation>2HR</translation>
     </message>
     <message>
         <source>     CONGRATULATIONS      </source>
         <translation>GRATULUJI</translation>
     </message>
     <message>
         <source>    YOU HAVE ARCHIEVED    </source>
         <translation>JSEŠ ZAPSÁN</translation>
     </message>
     <message>
         <source>  A SCORE IN THE TOP 10.  </source>
         <translation>SKÓRE V NEJLEPŠÍ 10.</translation>
     </message>
     <message>
         <source>RNK   SCORE  NAME   DATE</source>
         <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,
 nebo má neznámý formát.</translation>
     </message>
     <message>
         <source>Initialization Error</source>
         <translation>Chyba inicializace</translation>
     </message>
 </context>
 </TS>
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
@@ -1,181 +1,98 @@
 <!DOCTYPE TS><TS>
 <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>
         <source>Join</source>
         <translation>Přidej se</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>&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>
     <message>
         <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.2&lt;/b&gt;&lt;/center&gt;</source>
         <translation>&lt;center&gt;&lt;b&gt;Prostředí Open Palmtop Integrated Environment V1.2&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;Alberto &apos;Skyhusker&apos; Garcia Hierro&lt;/b&gt; (skyhusker@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>&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;Alberto &apos;Skyhusker&apos; Garcia Hierro&lt;/b&gt; (skyhusker@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>
 </TS>
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
@@ -1,107 +1,87 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BatteryStatus</name>
     <message>
         <source>Failure</source>
         <translation>Závada</translation>
     </message>
     <message>
         <source>could not open file</source>
         <translation>nelze otevřít soubor</translation>
     </message>
     <message>
         <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>
         <source>Very Low</source>
         <translation>Velmi špatný</translation>
     </message>
     <message>
         <source>Critical</source>
         <translation>Kritický</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Neznámý</translation>
     </message>
     <message>
         <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>
         <source>Remaining Time: %1m %2s</source>
         <translation>Zbývající čas: %1m %2s</translation>
     </message>
     <message>
         <source>Remaing Power: %1 %2
 Remaining Time: %3</source>
         <translation>Zbývající energie: %1 %2
 Zbývající čas: %3</translation>
     </message>
     <message>
         <source>Ipaq  %1</source>
         <translation>Ipaq  %1</translation>
     </message>
 </context>
 </TS>
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
@@ -1,171 +1,167 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CableEdit</name>
     <message>
         <source>Device filename needed</source>
         <translation>Potřebuji jméno zařízení</translation>
     </message>
 </context>
 <context>
     <name>CableGUI</name>
     <message>
         <source>Cable</source>
         <translation>Kabel</translation>
     </message>
     <message>
         <source>Lock file</source>
         <translation>Soubor zámku</translation>
     </message>
     <message>
         <source>Device</source>
         <translation>Zařízení</translation>
     </message>
     <message>
         <source>Serial settings</source>
         <translation>Sériová nastavení</translation>
     </message>
     <message>
         <source>2400</source>
         <translation>2400</translation>
     </message>
     <message>
         <source>9600</source>
         <translation>9600</translation>
     </message>
     <message>
         <source>19200</source>
         <translation>19200</translation>
     </message>
     <message>
         <source>38400</source>
         <translation>38400</translation>
     </message>
     <message>
         <source>57600</source>
         <translation>57600</translation>
     </message>
     <message>
         <source>115200</source>
         <translation>115200</translation>
     </message>
     <message>
         <source>230400</source>
         <translation>230400</translation>
     </message>
     <message>
         <source>460800</source>
         <translation>460800</translation>
     </message>
     <message>
         <source>500000</source>
         <translation>500000</translation>
     </message>
     <message>
         <source>921600</source>
         <translation>921600</translation>
     </message>
     <message>
         <source>1000000</source>
         <translation>1000000</translation>
     </message>
     <message>
         <source>1152000</source>
         <translation>1152000</translation>
     </message>
     <message>
         <source>1500000</source>
         <translation>1500000</translation>
     </message>
     <message>
         <source>2000000</source>
         <translation>2000000</translation>
     </message>
     <message>
         <source>2500000</source>
         <translation>2500000</translation>
     </message>
     <message>
         <source>3000000</source>
         <translation>3000000</translation>
     </message>
     <message>
         <source>3500000</source>
         <translation>3500000</translation>
     </message>
     <message>
         <source>4000000</source>
         <translation>4000000</translation>
     </message>
     <message>
         <source>Parity</source>
         <translation>Parita</translation>
     </message>
     <message>
         <source>Data bits</source>
         <translation>Datové bity</translation>
     </message>
     <message>
         <source>Speed</source>
         <translation>Rychlost</translation>
     </message>
     <message>
         <source>Stop bits</source>
         <translation>Stop bitů</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Ne</translation>
     </message>
     <message>
         <source>Even</source>
         <translation>Sudá</translation>
     </message>
     <message>
         <source>Odd</source>
         <translation>Lichá</translation>
     </message>
     <message>
         <source>Mark</source>
         <translation>Značka</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Mezera</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Flow control :</source>
         <translation>Řízení toku :</translation>
     </message>
     <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
@@ -1,170 +1,166 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Zatížení CPU aplikacemi (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>Zatížení CPU systémem (%)</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Tato strana ukazuje vytížení procesoru tohoto zařízení.</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Typ:</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation>Tato strana ukazuje obsazení paměti (RAM) vašeho zařízení.
 Paměť je kategorizována následovně:
 
 1. Used - paměť, kterou používá Opie a jiné běžící aplikace.
 2. Buffers - dočasné úložiště použité pro zvýšení výkonu
 3. Cached - informace, které byly nedávno použity, ale nebyly ještě uvolněny.
 4. Free - Volná paměť, kterou nepoužívá Opie, ani žádná jiná běžící aplikace.</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Celková paměť: %1 kB</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Used (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Buffers (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Cached (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Free (%1 kB)</translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation>Celkový Swap: %1 kB</translation>
     </message>
 </context>
 <context>
     <name>MemoryStatus</name>
     <message>
         <source>Memory Status</source>
         <translation>Stav paměti</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Paměť</translation>
     </message>
     <message>
         <source>Swapfile</source>
         <translation>Swap soubor</translation>
     </message>
     <message>
         <source>&lt;center&gt;&lt;b&gt;Memory Monitor Plugin&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Based on source code from:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;This program is licensed under GNU GPL.&lt;/center&gt;</source>
         <translation>&lt;center&gt;&lt;b&gt;Memory Monitor Plugin&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Založeno na zdrojovém kódu:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;Tento program je licencován pod GNU GPL.&lt;/center&gt;</translation>
     </message>
     <message>
         <source>About</source>
         <translation>O aplikaci</translation>
     </message>
 </context>
 <context>
     <name>Swapfile</name>
     <message>
         <source>Swapfile location</source>
         <translation>Umístění swap souboru</translation>
     </message>
     <message>
         <source>RAM</source>
         <translation>RAM</translation>
     </message>
     <message>
         <source>CF Card</source>
         <translation>Karta CF</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>Karta SD</translation>
     </message>
     <message>
         <source> On </source>
         <translation>Zapnout</translation>
     </message>
     <message>
         <source> Off </source>
         <translation>Vypnout</translation>
     </message>
     <message>
         <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>
         <source>Failed to initialize swapfile.</source>
         <translation>Nelze inicializovat swap soubor.</translation>
     </message>
     <message>
         <source>Swapfile created.</source>
         <translation>Swap soubor vytvořen.</translation>
     </message>
     <message>
         <source>Failed to remove swapfile.</source>
         <translation>Nelze odstranit swap soubor.</translation>
     </message>
     <message>
         <source>Swapfile removed.</source>
         <translation>Swap soubor odstraněn.</translation>
     </message>
     <message>
         <source>Swapfile activated.</source>
         <translation>Swap soubor aktivován.</translation>
     </message>
     <message>
         <source></source>
         <translation></translation>
     </message>
     <message>
         <source>2 Mb,4 Mb,6 Mb,8 Mb,16 Mb,32 Mb,64 Mb</source>
         <translation>2 MB,4 MB,6 MB,8 MB,16 MB,32 MB,64 MB</translation>
     </message>
 </context>
 </TS>
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
@@ -1,111 +1,95 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>System</name>
     <message>
         <source>Command : </source>
         <translation>Příkaz : </translation>
     </message>
     <message>
         <source>State should be off</source>
         <translation>Stav by měl být schozený</translation>
     </message>
     <message>
         <source>State should at least be off</source>
         <translation>Stav by měl být přinejmenším schozený</translation>
     </message>
 </context>
 <context>
     <name>TheNSResources</name>
     <message>
         <source>Network Device</source>
         <translation>Síťové zařízení</translation>
     </message>
     <message>
         <source>Character device</source>
         <translation>Znakové zařízení</translation>
     </message>
     <message>
         <source>IP Connection</source>
         <translation>IP připojení</translation>
     </message>
     <message>
         <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>
         <source>&lt;p&gt;Connection to a GPRS capable device&lt;/p&gt;</source>
         <translation>&lt;p&gt;Připojení k zařízení s možností GPRS&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Today Error</source>
         <translation>Chyba Today</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;Plugin &apos;%1&apos; způsobil zhroucení Today. Je možné, že plugin nebyl řádně instalován.&lt;br&gt; Today zkusí pokračovat v nahrávání pluginů.&lt;/qt&gt;</translation>
     </message>
 </context>
 <context>
     <name>networksettings2</name>
     <message>
         <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
@@ -1,100 +1,96 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation>Tlačítko kalendář</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation>Tlačítko kontakty</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation>Tlačítko Menu</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation>Tlačítko Mail</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation>Tlačítko Domů</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation>Tlačítko Záznam</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation>Dolní+Nahoru</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation>Dolní+Dolů</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation>Dolní+Vpravo</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation>Dolní+Vlevo</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation>Horní+Nahoru</translation>
     </message>
     <message>
         <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>
         <source>Todo Button</source>
         <translation>Tlačítko Todo</translation>
     </message>
     <message>
         <source>Hinge1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge3</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Trash</source>
         <translation>Koš</translation>
     </message>
 </context>
 </TS>
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
@@ -1,703 +1,667 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>OPimRecurrenceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Opakující se událost</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Žádný</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Den</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Týden</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Měsíc</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Rok</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Každý:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Frekvence</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Končit v:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Bez konečného data</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Opakovat v</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Pon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Úte</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Stř</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Čtv</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Pát</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sob</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Ned</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Každý</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>WeekVar</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceWidget</name>
     <message>
         <source>No End Date</source>
         <translation>Bez konečného data</translation>
     </message>
     <message>
         <source>days</source>
         <translation>dnů</translation>
     </message>
     <message>
         <source>day</source>
         <translation>den</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>týdnů</translation>
     </message>
     <message>
         <source>week</source>
         <translation>týden</translation>
     </message>
     <message>
         <source>months</source>
         <translation>měsíců</translation>
     </message>
     <message>
         <source>month</source>
         <translation>měsíc</translation>
     </message>
     <message>
         <source>years</source>
         <translation>let</translation>
     </message>
     <message>
         <source>year</source>
         <translation>rok</translation>
     </message>
     <message>
         <source> and </source>
         <translation>a</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>, a</translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, a</translation>
     </message>
     <message>
         <source>on </source>
         <translation>v</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation>bez opakování</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>dny</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Opakovat v</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Pon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Úte</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Stř</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Čtv</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Pát</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sob</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Ned</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>týdnů</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Opakovat dle</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Den</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>měsíce</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>roku</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Každý</translation>
     </message>
 </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>
         <source>Edit</source>
         <translation>Upravit</translation>
     </message>
     <message>
         <source>Click here to edit the selected item.</source>
         <translation>Klikněte pro upravení vybrané položky.</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplikovat</translation>
     </message>
     <message>
         <source>Click here to duplicate the selected item.</source>
         <translation>Klikněte pro vytvoření duplikátu vybrané položky.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Smazat</translation>
     </message>
     <message>
         <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>
         <translation>Priorita:</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation>Velmi vysoká</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Vysoká</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normální</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Nízká</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation>Velmi nízká</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Postup:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Uzávěrka:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorie:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation>Výchozí Email:</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&lt;br&gt;&lt;b&gt;Adresa zaměstnání:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Kancelář:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Webová stránka práce:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Telefon do práce:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Fax do práce:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Mobil do práce:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Pager do práce:</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;br&gt;&lt;b&gt;Adresa domů:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Domácí webová stránka:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Telefon domů:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Fax domů:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Soukromý mobil:</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation>Všechny Emaily:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Profese:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Asistent:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Vedoucí:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Muž</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Žena</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Pohlaví:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Manžel(ka):</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Narozeniny:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Výročí:</translation>
     </message>
     <message>
         <source>Children: </source>
         <translation>Děti:</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Přezdívka:</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Poznámky:</translation>
     </message>
     <message>
         <source>User Id</source>
         <translation>Uživatelské jméno</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Jméno</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Jméno</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Křestní jméno</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Příjmení</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>titul</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Soubor jako</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Název práce</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Oddělení</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Firma</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Telefon do práce</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Fax do práce</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Mobil do práce</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>Výchozí Email</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>Emaily</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Telefon domů</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Fax domů</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Soukromý mobil</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Ulice do práce</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Město do práce</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>Stát do práce</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>PSČ do práce</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>Země do práce</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Pager do práce</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Webová stránka práce</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Kancelář</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Profese</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Asistent</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Vedoucí</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Ulice domů</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Město domů</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>Stát domů</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>Domácí PSČ</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>Domácí země</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Domácí webová stránka</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Manžel(ka)</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Pohlaví</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Narozeniny</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Výročí</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Přezdívka</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Děti</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Poznámky</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Lokalita:</translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation>Toto je každodenní událost</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation>Toto je vícedenní událost</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation>Začátek:</translation>
     </message>
     <message>
         <source>End:</source>
         <translation>Konec:</translation>
     </message>
     <message>
         <source>Note:</source>
         <translation>Poznámka:</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Každý</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 každý</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>%1 každý</translation>
     </message>
     <message>
         <source>The %1 %2 of every</source>
         <translation>%1 %2 každého</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Každý</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Pondělí</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Úterý</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Středa</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Čtvrtek</translation>
     </message>
     <message>
         <source>Friday</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,56 +1,40 @@
 <!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>
         <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>Pozor: jestliže toto není &lt;b&gt;simulace&lt;/b&gt;, měli byste jít hned zpět přes všechny kroky. </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>Prosím kontaktujte vlastníka (instrukce následují), nebo to zkuste znovu (a počkejte po časové sankci), pokud jste legitimní uživatel</translation>
     </message>
 </context>
 </TS>
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,209 +1,175 @@
 <!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>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Čas podání:</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation>Jméno</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Velikost</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation>MIME typ</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation>Okno souboru</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Otevřít</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Uložit</translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation>Vyberte adresář</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation>Jméno:</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation>Styl</translation>
     </message>
     <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>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation>Konfigurovat klávesy</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation>Pixmapa</translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation>Jméno</translation>
     </message>
     <message>
         <source>Key</source>
         <translation>Klávesa</translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation>Výchozí klávesa</translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation>Zkratka pro vybranou akci</translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation>Žád&amp;ná</translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation>&amp;Výchozí</translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation>V&amp;lastní</translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation>Konfigurace kláves</translation>
     </message>
     <message>
         <source>Default: </source>
         <translation>Výchozí: </translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation>Klávesa je na černé listině</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>&lt;qt&gt;Vybraná klávesa je na černé listině a nelze ji vybrat tímto správcem. Prosím použijte jinou klávesu.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation>Tato klávesa byla již přiřazena</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;Klávesa, kterou jste vybrali již byla přiřazena jiné položce vaší konfigurace. Prosím zkuste jinou klávesu.&lt;/qt&gt;</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Documents</source>
         <translation>Dokumenty</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>Soubory</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation>Všechny soubory</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Žádný</translation>
     </message>
     <message>
         <source>Directories</source>
         <translation>Adresáře</translation>
     </message>
     <message>
         <source>All Directories</source>
         <translation>Všechny adresáře</translation>
     </message>
 </context>
 </TS>
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
@@ -1,318 +1,294 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>PPPAuthEdit</name>
     <message>
         <source>Login send missing</source>
         <translation>Posílaný Login chybí</translation>
     </message>
     <message>
         <source>Login expect missing</source>
         <translation>Očekávaný Login chybí</translation>
     </message>
     <message>
         <source>Password send missing</source>
         <translation>Posílané heslo chybí</translation>
     </message>
     <message>
         <source>Password expect missing</source>
         <translation>Očekávané heslo chybí</translation>
     </message>
     <message>
         <source>Pap/Chap/EAP client id missing</source>
         <translation>Pap/Chap/EAP klient id chybí</translation>
     </message>
     <message>
         <source>Pap/Chap/EAP server id missing</source>
         <translation>Pap/Chap/EAP server id chybí</translation>
     </message>
     <message>
         <source>Pap/Chap/EAP secret id missing</source>
         <translation>Pap/Chap/EAP secret id chybí</translation>
     </message>
 </context>
 <context>
     <name>PPPAuthGUI</name>
     <message>
         <source>PPPAuth</source>
         <translation>PPPAuth</translation>
     </message>
     <message>
         <source>Login</source>
         <translation>Login</translation>
     </message>
     <message>
         <source>ogin:</source>
         <translation>ogin:</translation>
     </message>
     <message>
         <source>assword:</source>
         <translation>assword:</translation>
     </message>
     <message>
         <source>Pap</source>
         <translation>Pap</translation>
     </message>
     <message>
         <source>Chap</source>
         <translation>Chap</translation>
     </message>
     <message>
         <source>EAP</source>
         <translation>EAP</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
         <source>Secret</source>
         <translation>Secret</translation>
     </message>
     <message>
         <source>*</source>
         <translation>*</translation>
     </message>
     <message>
         <source>Client</source>
         <translation>Klient</translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation>Terminál</translation>
     </message>
 </context>
 <context>
     <name>PPPDNSEdit</name>
     <message>
         <source>Domainname needed</source>
         <translation>Jméno domény je vyžadováno</translation>
     </message>
     <message>
         <source>DNS Servers needed</source>
         <translation>DNS servery jsou vyžadovány</translation>
     </message>
 </context>
 <context>
     <name>PPPDNSGUI</name>
     <message>
         <source>PPPDNS</source>
         <translation>PPPDNS</translation>
     </message>
     <message>
         <source>Server assigned</source>
         <translation>Přiděluje server</translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation>Pevný</translation>
     </message>
     <message>
         <source>DomainName</source>
         <translation>Jméno domény</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Adresa</translation>
     </message>
     <message>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
         <source>List</source>
         <translation>Seznam</translation>
     </message>
 </context>
 <context>
     <name>PPPDialingGUI</name>
     <message>
         <source>PPPDialing</source>
         <translation>Vytáčení PPP</translation>
     </message>
     <message>
         <source>Dialing</source>
         <translation>Vytáčení</translation>
     </message>
     <message>
         <source>GPRS</source>
         <translation>GPRS</translation>
     </message>
     <message>
         <source>APN</source>
         <translation>APN</translation>
     </message>
     <message>
         <source>Dialup</source>
         <translation>Dialup</translation>
     </message>
     <message>
         <source>Number</source>
         <translation>Číslo</translation>
     </message>
     <message>
         <source>Commands</source>
         <translation>Příkazy</translation>
     </message>
     <message>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
         <source>New Item</source>
         <translation>Nová položka</translation>
     </message>
 </context>
 <context>
     <name>PPPGUI</name>
     <message>
         <source>PPP</source>
         <translation>PPP</translation>
     </message>
     <message>
         <source>Authentication</source>
         <translation>Autentizace</translation>
     </message>
     <message>
         <source>IP settings</source>
         <translation>Nastavení IP</translation>
     </message>
     <message>
         <source>DNS Settings</source>
         <translation>Nastavení DNS</translation>
     </message>
     <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>
         <translation>PPPIP</translation>
     </message>
     <message>
         <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>
         <source>Local</source>
         <translation>Lokální</translation>
     </message>
     <message>
         <source>Server Overrules</source>
         <translation>Serverová překonání nastavení</translation>
     </message>
     <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>
         <translation>PPPRun</translation>
     </message>
     <message>
         <source>Upon connect</source>
         <translation>Při připojení</translation>
     </message>
     <message>
         <source>Before</source>
         <translation>Před</translation>
     </message>
     <message>
         <source>After</source>
         <translation>Potom</translation>
     </message>
     <message>
         <source>Upon disconnect</source>
         <translation>Při odpojení</translation>
     </message>
     <message>
         <source>&lt;UL&gt;
 &lt;LI&gt;Commands run under your &lt;b&gt;real&lt;/b&gt; user id (&lt;b&gt;not&lt;/b&gt; as root)&lt;/LI&gt;
 &lt;LI&gt;Supply the whole path&lt;/LI&gt;
 &lt;/UL&gt;</source>
         <translation>&lt;UL&gt;
 &lt;LI&gt;Příkazy běžící pod vaším &lt;b&gt;skutečným&lt;/b&gt; id (&lt;b&gt;ne&lt;/b&gt; jako root)&lt;/LI&gt;
 &lt;LI&gt;Zadejte celou cestu&lt;/LI&gt;
 &lt;/UL&gt;</translation>
     </message>
 </context>
 </TS>
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
@@ -1,164 +1,152 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ProfileGUI</name>
     <message>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
         <source>Setup</source>
         <translation>Nastavení</translation>
     </message>
     <message>
         <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>
         <source>eth0</source>
         <translation>eth0</translation>
     </message>
     <message>
         <source>(Multicast, Up)</source>
         <translation>(Multicast, Up)</translation>
     </message>
     <message>
         <source>Subnet Mask</source>
         <translation>Síťová maska</translation>
     </message>
     <message>
         <source>Broadcast</source>
         <translation>Broadcast</translation>
     </message>
     <message>
         <source>MAC</source>
         <translation>MAC</translation>
     </message>
     <message>
         <source>P-t-P</source>
         <translation>P-t-P</translation>
     </message>
     <message>
         <source>IP Address</source>
         <translation>IP adresa</translation>
     </message>
     <message>
         <source>0.0.0.0</source>
         <translation>0.0.0.0</translation>
     </message>
     <message>
         <source>00:00:00:00:00:00</source>
         <translation>00:00:00:00:00:00</translation>
     </message>
     <message>
         <source>DHCP</source>
         <translation>DHCP</translation>
     </message>
     <message>
         <source>Lease Expires</source>
         <translation>Pronájem vyprší</translation>
     </message>
     <message>
         <source>Lease Obtained</source>
         <translation>Pronájem získán</translation>
     </message>
     <message>
         <source>DHCP Server</source>
         <translation>DHCP Server</translation>
     </message>
     <message>
         <source>Traffic</source>
         <translation>Provoz</translation>
     </message>
     <message>
         <source>Receiving</source>
         <translation>Příjem</translation>
     </message>
     <message>
         <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>
         <source>Pkt</source>
         <translation>Pkt</translation>
     </message>
     <message>
         <source>ODO</source>
         <translation>ODO</translation>
     </message>
     <message>
         <source>Sending</source>
         <translation>Odesílání</translation>
     </message>
     <message>
         <source>Miscellaneous</source>
         <translation>Ostatní</translation>
     </message>
     <message>
         <source>Reset ODO</source>
         <translation>Reset ODO</translation>
     </message>
 </context>
 <context>
     <name>ProfileNetNode</name>
     <message>
         <source>Regular connection profile</source>
         <translation>Standardní profil připojení</translation>
     </message>
     <message>
         <source>&lt;p&gt;Define use of an IP connection.&lt;/p&gt;&lt;p&gt;Configure if and when this connection needs to be established&lt;/p&gt;</source>
         <translation>&lt;p&gt;Definuje použití IP připojení.&lt;/p&gt;&lt;p&gt;Nastavte jestliže budete potřebovat navázat spojení&lt;/p&gt;</translation>
     </message>
 </context>
 </TS>
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,114 +1,102 @@
 <!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>
         <source>The next birthdays will just be shown, if enabled!</source>
         <translation>Při zapnutí budou zobrazovány následující narozeniny!</translation>
     </message>
     <message>
         <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>
         <source>Colors for the headlines !</source>
         <translation>Barvy pro nadpisy!</translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
         <translation>Nastavení barvy položky:</translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation>Tato barva se použije pro zobrazení narozenin/výročí!</translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation>Nastaví urgentní
 barvu dole</translation>
     </message>
     <message>
         <source> days: </source>
         <translation>dnů:</translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation>Tato urgentní barva se použije při blížící se události!</translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation>Tato urgentní barva se použije při blížících se narozeninách/výročí méně než zadaný počet dnů!</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>AddressBook plugin</source>
         <translation>AddressBook plugin</translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation>Databáze neposkytuje tento vyhledávací dotaz! Prosím upgradujte libOpie !&lt;br&gt;</translation>
     </message>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>Další narozeniny za &lt;b&gt; %1 &lt;/b&gt; dnů:</translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>Za &lt;b&gt; %1 &lt;/b&gt; dnů nejsou žádné narozeniny!</translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>Další výročí za &lt;b&gt; %1 &lt;/b&gt; dnů:</translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>Za &lt;b&gt; %1 &lt;/b&gt; dnů nejsou žádná výročí!</translation>
     </message>
 </context>
 </TS>
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
@@ -1,121 +1,117 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>Weather plugin</source>
         <translation>Weather plugin</translation>
     </message>
 </context>
 <context>
     <name>WeatherPluginConfig</name>
     <message>
         <source>Enter ICAO location identifier:</source>
         <translation>Zadejte ICAO identifikaci lokality:</translation>
     </message>
     <message>
         <source>Enter the 4 letter code for the desired location here.  See http://www.nws.noaa.gov/tg/siteloc.shtml to find a location near you.</source>
         <translation>Zadejte 4 písmenný kód požadované lokality. Pro nalezení nejbližší lokality se podívejte sem: http://www.nws.noaa.gov/tg/siteloc.shtml .</translation>
     </message>
     <message>
         <source>Visit http://www.nws.noaa.gov/tg/siteloc.shtml to find the nearest location.</source>
         <translation>Navštivte http://www.nws.noaa.gov/tg/siteloc.shtml pro nalezení nejbižší lokality.</translation>
     </message>
     <message>
         <source>Use metric units</source>
         <translation>Používat jednotky metrické soustavy</translation>
     </message>
     <message>
         <source>Click here to select type of units displayed.</source>
         <translation>Pro výběr typu zobrazení jednotek klikněte sem.</translation>
     </message>
     <message>
         <source>Update frequency (in minutes):</source>
         <translation>Četnost aktualizace (v minutách):</translation>
     </message>
     <message>
         <source>Select how often (in minutes) you want the weather to be updated.</source>
         <translation>Vyberte, jak často (v minutách) chcete aktualizovat počasí.</translation>
     </message>
 </context>
 <context>
     <name>WeatherPluginWidget</name>
     <message>
         <source>Retreiving current weather information.</source>
         <translation>Stahuji aktuální informace o počasí.</translation>
     </message>
     <message>
         <source>Temp: </source>
         <translation>Teplota:</translation>
     </message>
     <message>
         <source>  Wind: </source>
         <translation>Vítr:</translation>
     </message>
     <message>
         <source>
 Pres: </source>
         <translation>
 Tlak:</translation>
     </message>
     <message>
         <source>Current weather data not available.</source>
         <translation>Aktuální data o počasí nejsou k dispozici.</translation>
     </message>
     <message>
         <source>n/a</source>
         <translation>n/a</translation>
     </message>
     <message>
         <source>E </source>
         <translation>V</translation>
     </message>
     <message>
         <source>NE </source>
         <translation>SV</translation>
     </message>
     <message>
         <source>N </source>
         <translation>S</translation>
     </message>
     <message>
         <source>NW </source>
         <translation>SZ</translation>
     </message>
     <message>
         <source>W </source>
         <translation>Z</translation>
     </message>
     <message>
         <source>SW </source>
         <translation>JZ</translation>
     </message>
     <message>
         <source>S </source>
         <translation>J</translation>
     </message>
     <message>
         <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
@@ -1,40 +1,36 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>VPNGUI</name>
     <message>
         <source>VPN</source>
         <translation>VPN</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Jméno</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Popis</translation>
     </message>
     <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
@@ -1,48 +1,36 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MindBreaker</name>
     <message>
         <source>New Game</source>
         <translation>Nová hra</translation>
     </message>
     <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>
         <source>Cancel</source>
         <translation>Storno</translation>
     </message>
 </context>
 </TS>
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
@@ -410,523 +410,503 @@
     <message>
         <source>Device</source>
         <translation>Zařízení</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Configure Profiles</source>
         <translation>Konfigurovat profily</translation>
     </message>
     <message>
         <source>New Profile</source>
         <translation>Nový profil</translation>
     </message>
     <message>
         <source>Save Profile</source>
         <translation>Uložit profil</translation>
     </message>
     <message>
         <source>Connect</source>
         <translation>Připojit</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>Odpojit</translation>
     </message>
     <message>
         <source>QuickLaunch</source>
         <translation>Rychlé spuštění</translation>
     </message>
     <message>
         <source>The shell button launches the &quot;default&quot; profile. If there is none default values are taken</source>
         <translation>Shellové tlačítko spustí profil &quot;výchozí&quot;, jestliže nebudou nalezeny žádné výchozí hodnoty</translation>
     </message>
     <message>
         <source>Transfer file...</source>
         <translation>Přenést soubor...</translation>
     </message>
     <message>
         <source>Line wrap</source>
         <translation>Zalamování řádek</translation>
     </message>
     <message>
         <source>Full screen</source>
         <translation>Celá obrazovka</translation>
     </message>
     <message>
         <source>Save history</source>
         <translation>Ukládat historii</translation>
     </message>
     <message>
         <source>Terminate</source>
         <translation>Přerušit</translation>
     </message>
     <message>
         <source>Close Window</source>
         <translation>Zavřít okno</translation>
     </message>
     <message>
         <source>Run Script</source>
         <translation>Spustit skript</translation>
     </message>
     <message>
         <source>Record Script</source>
         <translation>Nahrát skript</translation>
     </message>
     <message>
         <source>Save Script</source>
         <translation>Uložit skript</translation>
     </message>
     <message>
         <source>Open Keyboard...</source>
         <translation>Otevřít klávesnici...</translation>
     </message>
     <message>
         <source>New from Profile</source>
         <translation>Nové z profilu</translation>
     </message>
     <message>
         <source>Connection</source>
         <translation>Připojení</translation>
     </message>
     <message>
         <source>Scripts</source>
         <translation>Skripty</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Kopírovat</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Vložit</translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation>Nové připojení</translation>
     </message>
     <message>
         <source>Script</source>
         <translation>Skript</translation>
     </message>
     <message>
         <source>Save Connection</source>
         <translation>Uložit připojení</translation>
     </message>
     <message>
         <source>&lt;qt&gt;There is no Connection.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Není žádné připojení.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>History</source>
         <translation>Historie</translation>
     </message>
     <message>
         <source>Start log</source>
         <translation>Spustit logování</translation>
     </message>
     <message>
         <source>Stop log</source>
         <translation>Zastavit logování</translation>
     </message>
     <message>
         <source>Log</source>
         <translation>Log</translation>
     </message>
 </context>
 <context>
     <name>ModemConfigWidget</name>
     <message>
         <source>Modem is attached to:</source>
         <translation>Modem je připojen k:</translation>
     </message>
     <message>
         <source>Enter telefon number here:</source>
         <translation>Zde zadejte telefonní číslo:</translation>
     </message>
     <message>
         <source>AT commands</source>
         <translation>AT příkazy</translation>
     </message>
     <message>
         <source>Enter number</source>
         <translation>Zadejte číslo</translation>
     </message>
 </context>
 <context>
     <name>NoOptions</name>
     <message>
         <source>This Plugin does not support any configurations</source>
         <translation>Tento plugin nepodporuje žádnou konfiguraci</translation>
     </message>
 </context>
 <context>
     <name>ProfileEditorDialog</name>
     <message>
         <source>New Profile</source>
         <translation>Nový profil</translation>
     </message>
     <message>
         <source>Connection</source>
         <translation>Připojení</translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation>Terminál</translation>
     </message>
     <message>
         <source>Auto connect after load</source>
         <translation>Po spuštění automaticky připojit</translation>
     </message>
     <message>
         <source>Local Console</source>
         <translation>Lokální konzole</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Opie Console</source>
         <translation>Opie konzole</translation>
     </message>
     <message>
         <source>Failed</source>
         <translation>Selhání</translation>
     </message>
     <message>
         <source>Connecting failed for this session.</source>
         <translation>Pro tuto relaci připojení selhalo.</translation>
     </message>
     <message>
         <source>Session failed</source>
         <translation>Relace selhala</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Cannot open session: Not all components were found.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Nelze otevřít relaci: Nebyly nalezeny všechny komponenty.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Transfer mode</source>
         <translation>Režim přenosu</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Odeslat</translation>
     </message>
     <message>
         <source>Receive</source>
         <translation>Přijmout</translation>
     </message>
     <message>
         <source>Send file</source>
         <translation>Odeslat soubor</translation>
     </message>
     <message>
         <source>Transfer protocol</source>
         <translation>Přenosový protokol</translation>
     </message>
     <message>
         <source>Progress</source>
         <translation>Postup</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Stav</translation>
     </message>
     <message>
         <source>Ready</source>
         <translation>Připraven</translation>
     </message>
     <message>
         <source>Start transfer</source>
         <translation>Zahájit přenos</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Storno</translation>
     </message>
     <message>
         <source>File transfer</source>
         <translation>Přenos souboru</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation>Upozornění</translation>
     </message>
     <message>
         <source>No file has been specified.</source>
         <translation>Nebyl specifikován soubor.</translation>
     </message>
     <message>
         <source>Sending...</source>
         <translation>Odesílání...</translation>
     </message>
     <message>
         <source>Receiving...</source>
         <translation>Příjem...</translation>
     </message>
     <message>
         <source>Cancelled</source>
         <translation>Stornováno</translation>
     </message>
     <message>
         <source>The file transfer has been cancelled.</source>
         <translation>Přenos souboru byl stornován.</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
         <source>Operation not supported.</source>
         <translation>Nepodporovaná operace.</translation>
     </message>
     <message>
         <source>Transfer could not be started.</source>
         <translation>Nelze zahájit přenos.</translation>
     </message>
     <message>
         <source>No error.</source>
         <translation>Bez chyby.</translation>
     </message>
     <message>
         <source>Undefined error occured.</source>
         <translation>Nastala nedefinovaná chyba.</translation>
     </message>
     <message>
         <source>Incomplete transfer.</source>
         <translation>Nekompletní přenos.</translation>
     </message>
     <message>
         <source>Unknown error occured.</source>
         <translation>Nastala neznámá chyba.</translation>
     </message>
     <message>
         <source>Sent</source>
         <translation>Odesláno</translation>
     </message>
     <message>
         <source>File has been sent.</source>
         <translation>Soubor byl odeslán.</translation>
     </message>
     <message>
         <source>Received</source>
         <translation>Přijato</translation>
     </message>
     <message>
         <source>File has been received.</source>
         <translation>Soubor byl přijat.</translation>
     </message>
     <message>
         <source>Profile name</source>
         <translation>Název profilu</translation>
     </message>
     <message>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
         <source>Connection</source>
         <translation>Připojení</translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation>Terminál</translation>
     </message>
     <message>
         <source>Special Keys</source>
         <translation>Speciální klávesy</translation>
     </message>
     <message>
         <source>Invalid profile</source>
         <translation>Neplatný profil</translation>
     </message>
     <message>
         <source>Please enter a profile name.</source>
         <translation>Prosím zadejte název profilu.</translation>
     </message>
     <message>
         <source>Z-Modem</source>
         <translation>Z-Modem</translation>
     </message>
     <message>
         <source>Y-Modem</source>
         <translation>Y-Modem</translation>
     </message>
     <message>
         <source>X-Modem</source>
         <translation>X-Modem</translation>
     </message>
     <message>
         <source>Serial</source>
         <translation>Serial</translation>
     </message>
     <message>
         <source>Modem</source>
         <translation>Modem</translation>
     </message>
     <message>
         <source>Local Console</source>
         <translation>Lokální konzole</translation>
     </message>
     <message>
         <source>Default Terminal</source>
         <translation>Výchozí terminál</translation>
     </message>
     <message>
         <source>Default Keyboard</source>
         <translation>Výchozí klávesnice</translation>
     </message>
     <message>
         <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>
         <source>Reset speakers</source>
         <translation>Reset reproduktoru</translation>
     </message>
     <message>
         <source>Turning off dialtone</source>
         <translation>Vypínání oznamovacího tónu</translation>
     </message>
     <message>
         <source>Dial number</source>
         <translation>Vytočit číslo</translation>
     </message>
     <message>
         <source>Line busy, redialing number</source>
         <translation>Linka obsazena, vytáčím znovu</translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation>Spojení navázáno</translation>
     </message>
     <message>
         <source>Dismiss</source>
         <translation>Odejít</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Dialing the number failed.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Vytočení čísla selhalo.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Fixing up Embedix</source>
         <translation>Opravuji Embedix</translation>
     </message>
 </context>
 <context>
     <name>SerialConfigWidget</name>
     <message>
         <source>Device</source>
         <translation>Zařízení</translation>
     </message>
 </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>
         <source>Options</source>
         <translation>Možnosti</translation>
     </message>
     <message>
         <source>Local echo</source>
         <translation>Lokální echo</translation>
     </message>
     <message>
         <source>Line wrap</source>
         <translation>Zalamování řádek</translation>
     </message>
     <message>
         <source>VT 100</source>
         <translation>VT 100</translation>
     </message>
     <message>
         <source>VT 102</source>
         <translation>VT 102</translation>
     </message>
     <message>
         <source>Linux Console</source>
         <translation>Linux Console</translation>
     </message>
     <message>
         <source>X-Terminal</source>
         <translation>X-Terminal</translation>
     </message>
     <message>
         <source>black on white</source>
         <translation>černá na bílé</translation>
     </message>
     <message>
         <source>white on black</source>
         <translation>bílá na černé</translation>
     </message>
     <message>
         <source>green on black</source>
         <translation>zelená na černé</translation>
     </message>
     <message>
         <source>orange on black</source>
         <translation>oranžová na černé</translation>
     </message>
 </context>
 </TS>
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
@@ -1,316 +1,328 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BaseSetup</name>
     <message>
         <source> seconds</source>
         <translation>sekund</translation>
     </message>
     <message>
         <source>Slideshow timeout:</source>
         <translation>Časový limit slideshow:</translation>
     </message>
     <message>
         <source> pixel</source>
         <translation>pixel</translation>
     </message>
     <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>
         <source>Toggle autoscale</source>
         <translation>Přepnutí auto-zmenšení</translation>
     </message>
     <message>
         <source>Switch to next image</source>
         <translation>Přepnout na další obrázek</translation>
     </message>
     <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>
         <source>Delete Current Item</source>
         <translation>Smazat aktální položku</translation>
     </message>
     <message>
         <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>
         <source>Imageinfo Keyboard Actions</source>
         <translation>Klávesové akce informací o obrázku</translation>
     </message>
     <message>
         <source>Imageview Keyboard Actions</source>
         <translation>Klávesové akce zobrazení obrázku</translation>
     </message>
     <message>
         <source>Go dir up</source>
         <translation>O adresář výš</translation>
     </message>
     <message>
         <source>Beam file</source>
         <translation>Odeslat soubor</translation>
     </message>
     <message>
         <source>Show imageinfo</source>
         <translation>Zobrazit informaci o obrázku</translation>
     </message>
     <message>
         <source>Delete file</source>
         <translation>Smazat soubor</translation>
     </message>
     <message>
         <source>Display image</source>
         <translation>Zobrazit obrázek</translation>
     </message>
     <message>
         <source>Start slideshow</source>
         <translation>Spustit slideshow</translation>
     </message>
     <message>
         <source>Show toolbar</source>
         <translation>Zobrazit panel</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Nastavení</translation>
     </message>
     <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>
         <source>Name only</source>
         <translation>Jen jméno</translation>
     </message>
     <message>
         <source>Next image</source>
         <translation>Další obrázek</translation>
     </message>
     <message>
         <source>Previous image</source>
         <translation>Předchozí obrázek</translation>
     </message>
     <message>
         <source>Show images fullscreen</source>
         <translation>Zobrazit obrázky na celou obrazovku</translation>
     </message>
     <message>
         <source>Auto rotate images</source>
         <translation>Automaticky otočit obrázky</translation>
     </message>
     <message>
         <source>Show images unscaled</source>
         <translation>Zobrazit obrázky v originální velikosti</translation>
     </message>
     <message>
         <source>Show zoomer window when unscaled</source>
         <translation>Zobrazit lupu při originále</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Soubor</translation>
     </message>
     <message>
         <source>Show</source>
         <translation>Zobrazit</translation>
     </message>
     <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>
         <source>&lt;center&gt;&lt;b&gt;Be carefull with the following options!&lt;/b&gt;&lt;/center&gt;</source>
         <translation>&lt;center&gt;&lt;b&gt;Mějte se na pozoru s nasledujícími možnostmi!&lt;/b&gt;&lt;/center&gt;</translation>
     </message>
     <message>
         <source>Show files recursive</source>
         <translation>Zobrazit soubory rekurzivně</translation>
     </message>
     <message>
         <source>Recursion depth:</source>
         <translation>Hloubka rekurze:</translation>
     </message>
     <message>
         <source> directories</source>
         <translation>adresáře</translation>
     </message>
     <message>
         <source>Digital Camera View</source>
         <translation>Zobrazení digi foťákem</translation>
     </message>
     <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>
         <source>Name Only</source>
         <translation>Jen jméno</translation>
     </message>
 </context>
 <context>
     <name>imageinfo</name>
     <message>
         <source>View Full Image</source>
         <translation>Zobrazit celý obrázek</translation>
     </message>
     <message>
         <source>Image info</source>
         <translation>Informace o obrázku</translation>
     </message>
     <message>
         <source>Displays an thumbnail of the image</source>
         <translation>Zobrazí zmenšeninu obrázku</translation>
     </message>
     <message>
         <source>Displays info of selected image</source>
         <translation>Zobrazí info o vybraném obrázku</translation>
     </message>
 </context>
 </TS>
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
@@ -1,401 +1,251 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Title</source>
         <translation>Nadpis</translation>
     </message>
     <message>
         <source>Author</source>
         <translation>Autor</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Popis</translation>
     </message>
     <message>
         <source>Copyright</source>
         <translation>Autorská práva</translation>
     </message>
     <message>
         <source>Creation Time</source>
         <translation>Čas vytvoření</translation>
     </message>
     <message>
         <source>Software</source>
         <translation>Software</translation>
     </message>
     <message>
         <source>Disclaimer</source>
         <translation>Vzdání se práv</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Varování</translation>
     </message>
     <message>
         <source>Source</source>
         <translation>Zdroj</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Komentář</translation>
     </message>
     <message>
         <source>Grayscale</source>
         <translation>Odstíny šedi</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Neznámý</translation>
     </message>
     <message>
         <source>RGB</source>
         <translation>RGB</translation>
     </message>
     <message>
         <source>Palette</source>
         <translation>Paleta</translation>
     </message>
     <message>
         <source>Grayscale/Alpha</source>
         <translation>Odstíny šedi/Průhlednost</translation>
     </message>
     <message>
         <source>RGB/Alpha</source>
         <translation>RGB/Průhlednost</translation>
     </message>
     <message>
         <source>Deflate</source>
         <translation>Deflate</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Žádná</translation>
     </message>
     <message>
         <source>Adam7</source>
         <translation>Adam7</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Not a GIF file</source>
         <translation>Není to soubor GIF</translation>
     </message>
     <message>
         <source>Dimensions: %1x%2
 </source>
         <translation>Rozměry: %1x%2</translation>
     </message>
     <message>
         <source>Depth: %1 bits
 </source>
         <translation>Hloubka: %1 bitů</translation>
     </message>
     <message>
         <source>Sort Flag: %1
 </source>
         <translation>Řazení: %1</translation>
     </message>
     <message>
         <source>Size of Global Color Table: %1 colors
 </source>
         <translation>Velikost globální tabulky barev: %1 barev</translation>
     </message>
     <message>
         <source>Background Color Index: %1
 </source>
         <translation>Index barvy pozadí: %1</translation>
     </message>
     <message>
         <source>Pixel Aspect Ratio: %1 (Aspect Ratio %2)
 </source>
         <translation>Poměr stran bodu: %1 (Poměr stran %2)</translation>
     </message>
     <message>
         <source>Comment: %1
 </source>
         <translation>Komentář: %1</translation>
     </message>
     <message>
         <source>Depth: %1
 </source>
         <translation>Hloubka: %1</translation>
     </message>
     <message>
         <source>ColorMode: %1
 </source>
         <translation>Režim barev: %1</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Neznámý</translation>
     </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>
         <translation>Výrobce: %1</translation>
     </message>
     <message>
         <source>Model: %1
 </source>
         <translation>Model: %1</translation>
     </message>
     <message>
         <source>Orientation: %1
 </source>
         <translation>Orientace: %1</translation>
     </message>
     <message>
         <source>Flash used
 </source>
         <translation>Použitý blesk</translation>
     </message>
     <message>
         <source>Focal length: %1
 </source>
         <translation>Ohnisková vzdálenost: %1</translation>
     </message>
     <message>
         <source>35mm equivalent: %1
 </source>
         <translation>Ekvivalent 35mm: %1</translation>
     </message>
     <message>
         <source>CCD width: %1</source>
         <translation>Šířka CCD: %1</translation>
     </message>
     <message>
         <source>Exposure time: %1
 </source>
         <translation>Doba expozice: %1</translation>
     </message>
     <message>
         <source>Aperture: %1
 </source>
         <translation>Clona: %1</translation>
     </message>
     <message>
         <source>Distance: %1
 </source>
         <translation>Vzdálenost: %1</translation>
     </message>
     <message>
         <source>Infinite</source>
         <translation>Nekonečno</translation>
     </message>
     <message>
         <source>ISO equivalent: %1
 </source>
         <translation>Ekvivalent ISO: %1</translation>
     </message>
     <message>
         <source>EXIF comment: %1</source>
         <translation>EXIF komentář: %1</translation>
     </message>
     <message>
         <source>&lt;/qt&gt;</source>
         <translation>&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Dimensions: %1 x %2
 </source>
         <translation>Rozměry: %1 x %2
 </translation>
     </message>
     <message>
         <source>Size: %1
 </source>
         <translation>Velikost: %1
 </translation>
     </message>
     <message>
         <source>Compressed size: %1</source>
         <translation>Zpakovaná velikost: %1</translation>
     </message>
     <message>
         <source>used colors: %1
 </source>
         <translation>použité barvy: %1
 </translation>
     </message>
     <message>
         <source>Resolution: %1 x %2
 </source>
         <translation>Rozlišení: %1 x %2
 </translation>
     </message>
 </context>
 </TS>
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,134 +1,126 @@
 <!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>
         <source>User</source>
         <translation>Uživatel</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Heslo</translation>
     </message>
     <message>
         <source>Suspend</source>
         <translation>Uspat</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Menu</translation>
     </message>
 </context>
 <context>
     <name>LoginWindowImpl</name>
     <message>
         <source>Restart</source>
         <translation>Restart</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>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>
         <translation>Opie byla ukončena
 nezachytitelným signálem
 (%1)
 </translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Selhání</translation>
     </message>
     <message>
         <source>Could not start Opie.</source>
         <translation>Nelze nastartovat Opii.</translation>
     </message>
     <message>
         <source>Could not switch to new user identity</source>
         <translation>Nelze se přepnout na nového uživatele</translation>
     </message>
 </context>
 <context>
     <name>PasswordDialog</name>
     <message>
         <source>Set Password</source>
         <comment>Caption of the password dialog</comment>
         <translation>Nastavení hesla</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;Prosím nastavte heslo Superuživatele.&lt;/h2&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Password:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Heslo:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Confirm:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Potvrzení:&lt;/b&gt;</translation>
     </message>
 </context>
 <context>
     <name>PasswordDialogImpl</name>
     <message>
         <source>Trying to leave without password set</source>
         <translation>Zkouším odejít bez nastavení hesla</translation>
     </message>
     <message>
         <source>&lt;qt&gt;No password was set. This could lead to you not beeingable to remotely connect to your machine.Do you want to continue not setting a password?&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Heslo nebylo nastaveno. To může způsobit nemožnost vzdáleného připojení do vašeho zařízení. Opravdu chcete pokračovat bez nastavení hesla?&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Passwords don&apos;t match</source>
         <translation>Heslo nesouhlasí</translation>
     </message>
     <message>
         <source>&lt;qt&gt;The two passwords don&apos;t match. Please try again.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Obě hesla nesouhlasí. Prosím, zkuste to znovu.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Password not legal</source>
         <translation>Heslo není povoleno</translation>
     </message>
     <message>
         <source>&lt;qt&gt;The entered password is not a valid password.Please try entering a valid password.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Zadané heslo není platné heslo. Prosím zkuste zadat platné heslo.&lt;/qt&gt;</translation>
     </message>
 </context>
 </TS>
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
@@ -1,759 +1,723 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DCCProgress</name>
     <message>
         <source>Receiving file %1 from %2...</source>
         <translation>Přijímám soubor %1 od %2...</translation>
     </message>
     <message>
         <source>Successfully received %1</source>
         <translation>Úspěšně přijato %1</translation>
     </message>
     <message>
         <source>Aborted</source>
         <translation>Přerušeno</translation>
     </message>
     <message>
         <source>Peer Aborted</source>
         <translation>Vzdálené přerušení</translation>
     </message>
     <message>
         <source>Timeout</source>
         <translation>Vypršel čas</translation>
     </message>
 </context>
 <context>
     <name>DCCTransferTab</name>
     <message>
         <source>DCC Transfers in Progress</source>
         <translation>DCC přenosy jsou v běhu</translation>
     </message>
     <message>
         <source>There are transfers in progress. &lt;br&gt;If you close this tab, they will be canceled.&lt;br&gt;Do you want to close it anyway?</source>
         <translation>Přenosy jsou v běhu. &lt;br&gt;Pokud zavřete tuto záložku, tak budou přerušeny.&lt;br&gt;Chcete ji přesto zavřít?</translation>
     </message>
     <message>
         <source>&amp;Close</source>
         <translation>&amp;Zavřít</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Close</source>
         <translation>&amp;Nezavírat</translation>
     </message>
     <message>
         <source>DCC Transfer from %1</source>
         <translation>DCC přenos od %1</translation>
     </message>
     <message>
         <source>%1 is trying to send you the file %2
 (%3 bytes)</source>
         <translation>%1 se vám pokouší poslat soubor %2
 (%3 bajtů)</translation>
     </message>
     <message>
         <source>&amp;Accept</source>
         <translation>&amp;Akceptovat</translation>
     </message>
     <message>
         <source>&amp;Reject</source>
         <translation>&amp;Odmítnout</translation>
     </message>
 </context>
 <context>
     <name>IRCChannelTab</name>
     <message>
         <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>
         <source>Whois</source>
         <translation>Whois</translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation>Odpojeno</translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
         <translation>Připojeno, přihlašování ..</translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
         <translation>Přihlášení úspěšné.</translation>
     </message>
     <message>
         <source>Socket error : </source>
         <translation>Chyba soketu :</translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation>Spojení ukončeno</translation>
     </message>
 </context>
 <context>
     <name>IRCHistoryLineEdit</name>
     <message>
         <source>Next Tab</source>
         <translation>Další záložka</translation>
     </message>
     <message>
         <source>Previous Tab</source>
         <translation>Předchozí záložka</translation>
     </message>
     <message>
         <source>Close Tab</source>
         <translation>Zavřít záložku</translation>
     </message>
 </context>
 <context>
     <name>IRCMessageParser</name>
     <message>
         <source>Received unhandled numeric command: %1</source>
         <translation>Přijatý neošetřený numerický příkaz: %1</translation>
     </message>
     <message>
         <source>Received unhandled ctcp command: %1</source>
         <translation>Přijatý neošetřený ctcp příkaz: %1</translation>
     </message>
     <message>
         <source>Received unhandled literal command: %1</source>
         <translation>Přijatý neošetřený znakový příkaz: %1</translation>
     </message>
     <message>
         <source>Nonexistant channel join - desynchronized?</source>
         <translation>Neexistující spojení kanálů - rozsynchronizováno?</translation>
     </message>
     <message>
         <source>%1 joined channel %2</source>
         <translation>%1 se připojil do kanálu %2</translation>
     </message>
     <message>
         <source>Person has already joined the channel - desynchronized?</source>
         <translation>Osoba je již na kanále připojena - rozsynchronizováno?</translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
         <translation>Už jste přihlášen na kanále -  rozsynchronizováno?</translation>
     </message>
     <message>
         <source>You left channel %1</source>
         <translation>Opustil jste kanál %1</translation>
     </message>
     <message>
         <source>%1 left channel %2</source>
         <translation>%1 opustil kanál %2</translation>
     </message>
     <message>
         <source>Parting person not found - desynchronized?</source>
         <translation>Protější osoba zmizela - rozsynchronizováno?</translation>
     </message>
     <message>
         <source>Channel for part not found - desynchronized?</source>
         <translation>Kanál pro diskuzi nebyl nalezen - rozsynchronizováno?</translation>
     </message>
     <message>
         <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>
         <source>Mode change has unknown type</source>
         <translation>Změna režimu je neznámého typu</translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
         <translation>Změna režimu s neznámou osobou - rozsynchronizováno?</translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
         <translation>Změna režimu s neznámým příznakem</translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
         <translation>Změna režimu s neznámým kanálem - rozsynchronizováno?</translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
         <translation>Uživatelské režimy ještě nejsou podporovány</translation>
     </message>
     <message>
         <source>You were kicked from </source>
         <translation>Byl jste vykopnut z</translation>
     </message>
     <message>
         <source> by </source>
         <translation>od</translation>
     </message>
     <message>
         <source> was kicked from </source>
         <translation>vykopnut z</translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
         <translation>Vykopnutí neznámé osoby - rozsynchronizováno?</translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
         <translation>Neznámé kanálové vykopnutí - rozsynchronizováno?</translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
         <translation>Serverová zpráva s neznámým kanálem</translation>
     </message>
     <message>
         <source>You joined channel </source>
         <translation>Připojil jste se ke kanálu</translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
         <translation>Přezdívka se již používá, prosím připojte se znovu s jinou</translation>
     </message>
     <message>
         <source>No such nickname</source>
         <translation>Přezdívka nezadána</translation>
     </message>
     <message>
         <source>Server %1 version %2 supports usermodes &apos;%3&apos; and channelmodes &apos;%4&apos;</source>
         <translation>Server %1 verze %2 podporuje uživ. režimy &apos;%3&apos; a kanálové režimy &apos;%4&apos;</translation>
     </message>
     <message>
         <source>There are %1 operators connected</source>
         <translation>Je zde připojeno %1 operátorů</translation>
     </message>
     <message>
         <source>There are %1 unknown connection(s)</source>
         <translation>Je zde %1 neznámých připojení</translation>
     </message>
     <message>
         <source>There are %1 channels formed</source>
         <translation>Je zde zformováno %1 kanálů</translation>
     </message>
     <message>
         <source>Please wait a while and try again</source>
         <translation>Prosím chvíli počkejte a zkuste to znovu</translation>
     </message>
     <message>
         <source>Whois %1 (%2@%3)
 Real name: %4</source>
         <translation>Whois %1 (%2@%3)
 Skutečné jméno: %4</translation>
     </message>
     <message>
         <source>%1 is using server %2</source>
         <translation>%1 používá server %2</translation>
     </message>
     <message>
         <source>%1 is on channels: %2</source>
         <translation>%1 je na kanálech: %2</translation>
     </message>
     <message>
         <source>Names for %1: %2</source>
         <translation>Jména pro %1: %2</translation>
     </message>
     <message>
         <source>Time on server %1 is %2</source>
         <translation>Čas na serveru %1 je %2</translation>
     </message>
     <message>
         <source>Channel or nick %1 doesn&apos;t exists</source>
         <translation>Kanál, nebo přezdívka %1 neexistuje</translation>
     </message>
     <message>
         <source>There is no history information for %1</source>
         <translation>Chybí zde informace historie pro %1</translation>
     </message>
     <message>
         <source>Unknown command: %1</source>
         <translation>Neznámý příkaz: %1</translation>
     </message>
     <message>
         <source>Can&apos;t change nick to %1: %2</source>
         <translation>Nelze změnit přezdívku na %1: %2</translation>
     </message>
     <message>
         <source>You&apos;re not on channel %1</source>
         <translation>Nejste na kanálu %1</translation>
     </message>
     <message>
         <source>[%1] Operation not permitted, you don&apos;t have enough channel privileges</source>
         <translation>[%1] Operace není povolena, nemáte dostatečná práva na kanálu</translation>
     </message>
     <message>
         <source>Connected to</source>
         <translation>Připojeno k</translation>
     </message>
     <message>
         <source>%1 has been idle for %2</source>
         <translation>%1 nic nedělá už %2</translation>
     </message>
     <message>
         <source>%1 signed on %2</source>
         <translation>%1 přihlášen na %2</translation>
     </message>
     <message>
         <source>CTCP PING with unknown person - Desynchronized?</source>
         <translation>CTCP PING s neznámou osobou - Rozsynchronizováno?</translation>
     </message>
     <message>
         <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>
         <source>Save As</source>
         <translation>Uložit jako</translation>
     </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
         <translation>Rozhovor s</translation>
     </message>
     <message>
         <source>Private discussion</source>
         <translation>Privátní diskuse</translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
         <translation>Sem pište text, který chcete odeslat druhé osobě</translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation>Odpojeno</translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
         <translation>Název profilu :</translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
         <translation>Název tohoto profilu serveru ve zkratce</translation>
     </message>
     <message>
         <source>Hostname :</source>
         <translation>Hostitel :</translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
         <translation>Server pro připojení - může to být platné jméno, nebo IP adresa</translation>
     </message>
     <message>
         <source>Port :</source>
         <translation>Port :</translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
         <translation>Port serveru pro připojení. Obvykle 6667</translation>
     </message>
     <message>
         <source>Nickname :</source>
         <translation>Přezdívka :</translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
         <translation>Vaše přezdívka na IRC síti</translation>
     </message>
     <message>
         <source>Realname :</source>
         <translation>Skutečné jméno: </translation>
     </message>
     <message>
         <source>Your real name</source>
         <translation>Vaše skutečné jméno</translation>
     </message>
     <message>
         <source>Password :</source>
         <translation>Heslo :</translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
         <translation>Heslo pro připojení k serveru (pokud je vyžadováno)</translation>
     </message>
     <message>
         <source>Channels :</source>
         <translation>Kanály :</translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
         <translation>Seznam kanálů, které chcete automaticky připojit, oddělených čárkami</translation>
     </message>
     <message>
         <source>Edit server information</source>
         <translation>Upravit informace o serveru</translation>
     </message>
     <message>
         <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>
         <translation>Prohlížeč seznamu serverů</translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
         <translation>Prosím vyberte profil serveru</translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
         <translation>Vyberte profil serveru a potom klikněte na OK v pravém horním rohu</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Smazat</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Upravit</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Přidat</translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
         <translation>Smazat označený profil serveru</translation>
     </message>
     <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>
 <context>
     <name>IRCSession</name>
     <message>
         <source>You are now known as %1</source>
         <translation>Přejmenoval jste se na %1</translation>
     </message>
     <message>
         <source>Nickname change of an unknown person</source>
         <translation>Změna přezdívky neznámé osoby</translation>
     </message>
     <message>
         <source>%1 is now known as %2</source>
         <translation>%1 se přejmenoval na %2</translation>
     </message>
 </context>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Settings</source>
         <translation>Nastavení</translation>
     </message>
     <message>
         <source>Lines displayed :</source>
         <translation>Zobrazeno řádek :</translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
         <translation>Počet řádek, které se mají zobrazit, než se staré řádky smažou - toto je nutné pro omezení spotřeby paměti. Nastavte na 0, pokud to nepotřebujete</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Hlavní</translation>
     </message>
     <message>
         <source>Background color :</source>
         <translation>Barva pozadí :</translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
         <translation>Barva pozadí použitá při diskuzích</translation>
     </message>
     <message>
         <source>Normal text color :</source>
         <translation>Barva normálního textu :</translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
         <translation>Barva textu použitá při diskuzích</translation>
     </message>
     <message>
         <source>Error color :</source>
         <translation>Chybová barva :</translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
         <translation>Barva textu použitá při zobrazování chyb</translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
         <translation>Text napsaný vámi :</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
         <translation>Barva textu, která se používá pro identifikaci vašeho textu</translation>
     </message>
     <message>
         <source>Text written by others :</source>
         <translation>Text napsaný ostatními :</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
         <translation>Barva textu použitá pro identifikaci textu napsaného ostatními</translation>
     </message>
     <message>
         <source>Text written by the server :</source>
         <translation>Text napsaný serverem :</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
         <translation>Barva textu použitá pro identifikaci textu napsaného serverem</translation>
     </message>
     <message>
         <source>Notifications :</source>
         <translation>Sdělení :</translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
         <translation>Barva textu použitá při zobrazování sdělení</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Barvy</translation>
     </message>
     <message>
         <source>Display time in chat log</source>
         <translation>Zobrazit čas v chat logu</translation>
     </message>
     <message>
         <source>Keyboard Shortcuts</source>
         <translation>Klávesové zkratky</translation>
     </message>
 </context>
 <context>
     <name>IRCTab</name>
     <message>
         <source>Missing description</source>
         <translation>Bez popisu</translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
         <translation>Popis obsahu záložky</translation>
     </message>
     <message>
         <source>Close this tab</source>
         <translation>Zavřít tuto záložku</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
         <translation>IRC klient</translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
         <translation>Serverová připojení, kanály, dotazy a další věci budou umístěny zde</translation>
     </message>
     <message>
         <source>IRC</source>
         <translation>IRC</translation>
     </message>
     <message>
         <source>New connection</source>
         <translation>Nové připojení</translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
         <translation>Vytvořit nové připojení k IRC serveru</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Nastavení</translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
         <translation>Konfigurujte vzhled a chování OpieIRC</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source> User</source>
         <translation>Uživatel</translation>
     </message>
     <message>
         <source>Opie IRC</source>
         <translation>Opie IRC</translation>
     </message>
     <message>
         <source> gives channel operator status to </source>
         <translation>dát stav operátora kanálu</translation>
     </message>
     <message>
         <source> removes channel operator status from </source>
         <translation>vzít stav operátora kanálu</translation>
     </message>
     <message>
         <source> gives voice to </source>
         <translation>dát hlas komu</translation>
     </message>
     <message>
         <source> removes voice from </source>
         <translation>vzít hlas komu</translation>
     </message>
 </context>
 </TS>
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
@@ -1,835 +1,880 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AccountView</name>
     <message>
         <source>Error creating new Folder</source>
         <translation>Nelze vytvořit novou složku</translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation>&lt;center&gt;Chyba během vytváření&lt;br&gt;nové složky - přerušení.&lt;/center&gt;</translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation>V adresáři nejsou žádné položky.</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Vyberte alespoň jednu položku adresáře.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
 </context>
 <context>
     <name>AddressPickerUI</name>
     <message>
         <source>Address Picker</source>
         <translation>Sběrač adres</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Storno</translation>
     </message>
 </context>
 <context>
     <name>ComposeMail</name>
     <message>
         <source>Name</source>
         <translation>Jméno</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Velikost</translation>
     </message>
     <message>
         <source>Problem</source>
         <translation>Problém</translation>
     </message>
     <message>
         <source>&lt;p&gt;Please create an SMTP account first.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Prosím vytvořte nejdříve SMTP účet.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <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>
         <source>No</source>
         <translation>Ne</translation>
     </message>
     <message>
         <source>&lt;center&gt;Attachments will not be stored in &quot;Draft&quot; folder&lt;/center&gt;</source>
         <translation>&lt;center&gt;Přílohy nebudou uloženy do složky&quot;Koncepty&quot;&lt;/center&gt;</translation>
     </message>
     <message>
         <source>No Receiver specified</source>
         <translation>Nespecifikován příjemce</translation>
     </message>
 </context>
 <context>
     <name>ComposeMailUI</name>
     <message>
         <source>Compose Message</source>
         <translation>Napsat zprávu</translation>
     </message>
     <message>
         <source>send later</source>
         <translation>odeslat později</translation>
     </message>
     <message>
         <source>use:</source>
         <translation>použít:</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Mail</translation>
     </message>
     <message>
         <source>Subject</source>
         <translation>Předmět</translation>
     </message>
     <message>
         <source>From</source>
         <translation>Od</translation>
     </message>
     <message>
         <source>To</source>
         <translation>Komu</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Možnosti</translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation>Odpovědět</translation>
     </message>
     <message>
         <source>BCC</source>
         <translation>Slepá kopie</translation>
     </message>
     <message>
         <source>Signature</source>
         <translation>Podpis</translation>
     </message>
     <message>
         <source>CC</source>
         <translation>Kopie</translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation>Příloha</translation>
     </message>
     <message>
         <source>Delete File</source>
         <translation>Smazat soubor</translation>
     </message>
     <message>
         <source>Add File</source>
         <translation>Přidat soubor</translation>
     </message>
 </context>
 <context>
     <name>EditAccounts</name>
     <message>
         <source>Account</source>
         <translation>Účet</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
         <source>Question</source>
         <translation>Otázka</translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete the selected Account?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Opravdu chcete smazat vybraný účet?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Ano</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Ne</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select an account.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Prosím vyberte účet.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
 </context>
 <context>
     <name>EditAccountsUI</name>
     <message>
         <source>Configure Accounts</source>
         <translation>Konfigurovat účty</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Mail</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Smazat</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nový</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Název účtu</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Upravit</translation>
     </message>
     <message>
         <source>News</source>
         <translation>Novinky</translation>
     </message>
 </context>
 <context>
     <name>IMAPconfigUI</name>
     <message>
         <source>Configure IMAP</source>
         <translation>Konfigurovat IMAP</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Uživatel</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Heslo</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Název účtu</translation>
     </message>
     <message>
         <source>Account</source>
         <translation>Účet</translation>
     </message>
     <message>
         <source>Prefix</source>
         <translation>Prefix</translation>
     </message>
     <message>
         <source>ssh $SERVER exec</source>
         <translation>ssh $SERVER exec</translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation>Použít zabezpečení:</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Mail</source>
         <translation>Mail</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Nastavení</translation>
     </message>
     <message>
         <source>Compose new mail</source>
         <translation>Napsat novou zprávu</translation>
     </message>
     <message>
         <source>Send queued mails</source>
         <translation>Odeslat zprávy ve frontě</translation>
     </message>
     <message>
         <source>Show/Hide folders</source>
         <translation>Ukázat/skrýt složky</translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation>Smazat zprávu</translation>
     </message>
     <message>
         <source>Edit settings</source>
         <translation>Upravit nastavení</translation>
     </message>
     <message>
         <source>Configure accounts</source>
         <translation>Konfigurovat účty</translation>
     </message>
     <message>
         <source>Mailbox</source>
         <translation>Schránka</translation>
     </message>
     <message>
         <source>Subject</source>
         <translation>Předmět</translation>
     </message>
     <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>
         <translation>Seznam novinek</translation>
     </message>
     <message>
         <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.
 Potom dejte znovu &quot;stáhnou seznam skupin&quot; a uvidíte pouze
 skupiny začínající tímto filtrem.</translation>
     </message>
 </context>
 <context>
     <name>NNTPconfigUI</name>
     <message>
         <source>Configure NNTP</source>
         <translation>Konfigurovat NNTP</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Název účtu</translation>
     </message>
     <message>
         <source>Account</source>
         <translation>Účet</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
         <source>Use SSL</source>
         <translation>Používat SSL</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Uživatel</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Heslo</translation>
     </message>
     <message>
         <source>Use Login</source>
         <translation>Používat přihlašování</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Skupiny</translation>
     </message>
     <message>
         <source>Newsgroup</source>
         <translation>Skupina novinek</translation>
     </message>
     <message>
         <source>Get newsgroup list from server</source>
         <translation>Stáhnout seznam skupin ze serveru</translation>
     </message>
 </context>
 <context>
     <name>Newmdirdlgui</name>
     <message>
         <source>Enter directory name</source>
         <translation>Zadejte název adresáře</translation>
     </message>
     <message>
         <source>Directory name:</source>
         <translation>Název adresáře:</translation>
     </message>
     <message>
         <source>Directory contains other subdirs</source>
         <translation>Adresář obsahuje podadresáře</translation>
     </message>
 </context>
 <context>
     <name>OpieMail</name>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
         <source>Mail queue flushed</source>
         <translation>Fronta vyprázdněna</translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation>Smazat zprávu</translation>
     </message>
     <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>Read this mail</source>
         <translation>Přečíst tuto zprávu</translation>
     </message>
     <message>
         <source>Delete this mail</source>
         <translation>Smazat tuto zprávu</translation>
     </message>
     <message>
         <source>Copy/Move this mail</source>
         <translation>Kopírovat/Přesunout zprávu</translation>
     </message>
     <message>
         <source>Error creating new Folder</source>
         <translation>Nelze vytvořit nová složka</translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation>&lt;center&gt;Chyba během vytváření&lt;br&gt;nové složky - přerušení.&lt;/center&gt;</translation>
     </message>
     <message>
         <source>Define a smtp account first</source>
         <translation>Nejdříve vytvořte smtp účet</translation>
     </message>
     <message>
         <source>Read this posting</source>
         <translation>Číst tuto zprávu</translation>
     </message>
     <message>
         <source>Edit this mail</source>
         <translation>Upravit tuto zprávu</translation>
     </message>
 </context>
 <context>
     <name>POP3configUI</name>
     <message>
         <source>Configure POP3</source>
         <translation>Konfigurace POP3</translation>
     </message>
     <message>
         <source>Account</source>
         <translation>Účet</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Název účtu</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation>Použít zabezpečení:</translation>
     </message>
     <message>
         <source>ssh $SERVER exec imapd</source>
         <translation>ssh $SERVER exec imapd</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Uživatel</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Heslo</translation>
     </message>
     <message>
         <source>ask before downloading large mails</source>
         <translation>Zeptat se před stažením velkých zpráv</translation>
     </message>
     <message>
         <source>Large mail size (kb):</source>
         <translation>Velikost velké zprávy (kb):</translation>
     </message>
     <message>
         <source> kB</source>
         <translation>kB</translation>
     </message>
 </context>
 <context>
     <name>SMTPconfigUI</name>
     <message>
         <source>Configure SMTP</source>
         <translation>Konfigurovat SMTP</translation>
     </message>
     <message>
         <source>Account</source>
         <translation>Účet</translation>
     </message>
     <message>
         <source>Use Login</source>
         <translation>Používat přihlašování</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Název účtu</translation>
     </message>
     <message>
         <source>Name of the SMTP Server</source>
         <translation>Název SMTP serveru</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Heslo</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
         <source>Port of the SMTP Server</source>
         <translation>Port SMTP serveru</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Uživatel</translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation>Použít zabezpečení:</translation>
     </message>
     <message>
         <source>ssh $SERVER exec</source>
         <translation>ssh $SERVER exec</translation>
     </message>
 </context>
 <context>
     <name>SelectMailTypeUI</name>
     <message>
         <source>Select Type</source>
         <translation>Vyberte typ</translation>
     </message>
     <message>
         <source>Select Account Type</source>
         <translation>Vyberte typ účtu</translation>
     </message>
     <message>
         <source>IMAP</source>
         <translation>IMAP</translation>
     </message>
     <message>
         <source>POP3</source>
         <translation>POP3</translation>
     </message>
     <message>
         <source>SMTP</source>
         <translation>SMTP</translation>
     </message>
 </context>
 <context>
     <name>SettingsDialogUI</name>
     <message>
         <source>Settings Dialog</source>
         <translation>Okno nastavení</translation>
     </message>
     <message>
         <source>View Mail</source>
         <translation>Zobrazit zprávu</translation>
     </message>
     <message>
         <source>View mail as Html</source>
         <translation>Zobrazit jako Html</translation>
     </message>
     <message>
         <source>Compose Mail</source>
         <translation>Napsat zprávu</translation>
     </message>
     <message>
         <source>Send mails later ( enqueue in outbox )</source>
         <translation>Odeslat zprávy později (zůstanou v outboxu)</translation>
     </message>
     <message>
         <source>Taskbar Applet</source>
         <translation>Applet na lištu</translation>
     </message>
     <message>
         <source>Disable Taskbar Applet</source>
         <translation>Vypnout applet na liště</translation>
     </message>
     <message>
         <source> min</source>
         <translation>min</translation>
     </message>
     <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>
     <message>
         <source>From</source>
         <translation>Od</translation>
     </message>
     <message>
         <source>To</source>
         <translation>Komu</translation>
     </message>
     <message>
         <source>Cc</source>
         <translation>Kopie</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot reply yet.</source>
         <translation>&lt;p&gt;Tělo zprávy ještě nebylo staženo, nemůžete zatím odpovídat.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot forward yet.</source>
         <translation>&lt;p&gt;Tělo zprávy ještě nebylo staženo, nemůžete zatím přesměrovávat.</translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation>Smazat zprávu</translation>
     </message>
     <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>
         <source>Attachments</source>
         <translation>Přílohy</translation>
     </message>
     <message>
         <source>Show Html</source>
         <translation>Ukázat Html</translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation>Smazat zprávu</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Popis</translation>
     </message>
     <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>
         <translation>Okno výběru cíle</translation>
     </message>
     <message>
         <source>&lt;b&gt;Store mail(s) to&lt;/b&gt;</source>
         <translation>&lt;b&gt;Uložit zprávy do&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Folder:</source>
         <translation>Složka:</translation>
     </message>
     <message>
         <source>Account:</source>
         <translation>Účet:</translation>
     </message>
     <message>
         <source>Create new folder</source>
         <translation>Vytvořit novou složku</translation>
     </message>
     <message>
         <source>Prefix will prepend, no need to enter it!</source>
         <translation>Prefix se objeví sám, není třeba ho zadávat!</translation>
     </message>
     <message>
         <source>Move mail(s)</source>
         <translation>Přesunout zprávy</translation>
     </message>
 </context>
 </TS>
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
@@ -1,196 +1,154 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HelpWindow</name>
     <message>
         <source>Backward</source>
         <translation>Předchozí</translation>
     </message>
     <message>
         <source>Forward</source>
         <translation>Vpřed</translation>
     </message>
 </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>
         <source>Unlimited</source>
         <translation>Neomezeno</translation>
     </message>
     <message>
         <source>File Directory</source>
         <translation>Souborový adresář</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <source>Rename</source>
         <translation>Přejmenovat</translation>
     </message>
     <message>
         <source>Ir Beam out</source>
         <translation>Odeslat přes infra</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>Odesláno přes infra.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Del</source>
         <translation>Smazat</translation>
     </message>
     <message>
         <source>Stereo</source>
         <translation>Stereo</translation>
     </message>
     <message>
         <source>Please select file to play</source>
         <translation>Prosím vyberte soubor pro přehrátí</translation>
     </message>
 </context>
 </TS>
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
@@ -1,151 +1,131 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>OSearch</source>
         <translation>OSearch</translation>
     </message>
     <message>
         <source>The details of the current result</source>
         <translation>Detaily aktuálního výsledku</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Aplikace</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Dokumenty</translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation>Seznam Todo</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Kalendář</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Kontakty</translation>
     </message>
     <message>
         <source>Search</source>
         <translation>Hledat</translation>
     </message>
     <message>
         <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>
         <source></source>
         <translation></translation>
     </message>
     <message>
         <source>Case sensitive</source>
         <translation>Rozlišovat velikost</translation>
     </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>
         <source>open in filemanager</source>
         <translation>otevřít ve správci souborů</translation>
     </message>
     <message>
         <source>File: </source>
         <translation>Soubor:</translation>
     </message>
     <message>
         <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>
         <source>Search in dates</source>
         <translation>Hledat v datech</translation>
     </message>
     <message>
         <source>Search content</source>
         <translation>Hledat obsah</translation>
     </message>
 </context>
 </TS>
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
@@ -1,475 +1,463 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CalcDlg</name>
     <message>
         <source>Molecular Weight</source>
         <translation>Molekulární váha</translation>
     </message>
     <message>
         <source>Chemical Formula</source>
         <translation>Chemický vzorec</translation>
     </message>
     <message>
         <source>Calculate</source>
         <translation>Spočítat</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>Smazat</translation>
     </message>
     <message>
         <source>Molecular Weight (u):</source>
         <translation>Molekulární váha (u):</translation>
     </message>
     <message>
         <source>Elemental Composition (%):</source>
         <translation>Elemetární složení (%):</translation>
     </message>
     <message>
         <source>CalcDlg</source>
         <translation>Okno počítání</translation>
     </message>
 </context>
 <context>
     <name>OxydataWidget</name>
     <message>
         <source>%1 u</source>
         <translation>%1 u</translation>
     </message>
     <message>
         <source>%1 pm</source>
         <translation>%1 pm</translation>
     </message>
     <message>
         <source>%1 J</source>
         <translation>%1 J</translation>
     </message>
     <message>
         <source>%1 g/cm^3</source>
         <translation>%1 g/cm^3</translation>
     </message>
     <message>
         <source>%1 K</source>
         <translation>%1 K</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation>Váha</translation>
     </message>
     <message>
         <source>Block</source>
         <translation>Blok</translation>
     </message>
     <message>
         <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>
 <context>
     <name>Oxygen</name>
     <message>
         <source>Oxygen</source>
         <translation>Kyslík</translation>
     </message>
     <message>
         <source>PSE</source>
         <translation>PSE</translation>
     </message>
     <message>
         <source>Data</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation>Výpočty</translation>
     </message>
     <message>
         <source>Hydrogen</source>
         <translation></translation>
     </message>
     <message>
         <source>Helium</source>
         <translation>Helium</translation>
     </message>
     <message>
         <source>Lithium</source>
         <translation>Lithium</translation>
     </message>
     <message>
         <source>Beryllium</source>
         <translation>Berylium</translation>
     </message>
     <message>
         <source>Boron</source>
         <translation>Bor</translation>
     </message>
     <message>
         <source>Carbon</source>
         <translation>Uhlík</translation>
     </message>
     <message>
         <source>Nitrogen</source>
         <translation>Dusík</translation>
     </message>
     <message>
         <source>Fluorine</source>
         <translation>Fluor</translation>
     </message>
     <message>
         <source>Neon</source>
         <translation>Neon</translation>
     </message>
     <message>
         <source>Sodium</source>
         <translation>Sodík</translation>
     </message>
     <message>
         <source>Magnesium</source>
         <translation>Hořčík</translation>
     </message>
     <message>
         <source>Aluminum</source>
         <translation>Hliník</translation>
     </message>
     <message>
         <source>Silicon</source>
         <translation>Křemík</translation>
     </message>
     <message>
         <source>Phosphorus</source>
         <translation>Fosfor</translation>
     </message>
     <message>
         <source>Sulfur</source>
         <translation>Síra</translation>
     </message>
     <message>
         <source>Chlorine</source>
         <translation>Chlór</translation>
     </message>
     <message>
         <source>Argon</source>
         <translation>Argon</translation>
     </message>
     <message>
         <source>Potassium</source>
         <translation>Draslík</translation>
     </message>
     <message>
         <source>Calcium</source>
         <translation>Vápník</translation>
     </message>
     <message>
         <source>Scandium</source>
         <translation>Skandium</translation>
     </message>
     <message>
         <source>Titanium</source>
         <translation>Titan</translation>
     </message>
     <message>
         <source>Vanadium</source>
         <translation>Vanadium</translation>
     </message>
     <message>
         <source>Chromium</source>
         <translation>Chrom</translation>
     </message>
     <message>
         <source>Manganese</source>
         <translation>Mangan</translation>
     </message>
     <message>
         <source>Iron</source>
         <translation>Železo</translation>
     </message>
     <message>
         <source>Cobalt</source>
         <translation>Kobalt</translation>
     </message>
     <message>
         <source>Nickel</source>
         <translation>Nikl</translation>
     </message>
     <message>
         <source>Copper</source>
         <translation>Měď</translation>
     </message>
     <message>
         <source>Zinc</source>
         <translation>Zinek</translation>
     </message>
     <message>
         <source>Gallium</source>
         <translation>Galium</translation>
     </message>
     <message>
         <source>Germanium</source>
         <translation>Germanium</translation>
     </message>
     <message>
         <source>Arsenic</source>
         <translation>Arzén</translation>
     </message>
     <message>
         <source>Selenium</source>
         <translation>Selén</translation>
     </message>
     <message>
         <source>Bromine</source>
         <translation>Bróm</translation>
     </message>
     <message>
         <source>Krypton</source>
         <translation>Krypton</translation>
     </message>
     <message>
         <source>Rubidium</source>
         <translation>Rubidium</translation>
     </message>
     <message>
         <source>Strontium</source>
         <translation>Stroncium</translation>
     </message>
     <message>
         <source>Yttrium</source>
         <translation>Yttrium</translation>
     </message>
     <message>
         <source>Zirconium</source>
         <translation>Zirkonium</translation>
     </message>
     <message>
         <source>Niobium</source>
         <translation>Niob</translation>
     </message>
     <message>
         <source>Molybdenum</source>
         <translation>Molybden</translation>
     </message>
     <message>
         <source>Technetium</source>
         <translation>Technecium</translation>
     </message>
     <message>
         <source>Ruthenium</source>
         <translation>Ruthenium</translation>
     </message>
     <message>
         <source>Rhodium</source>
         <translation>Rhodium</translation>
     </message>
     <message>
         <source>Palladium</source>
         <translation>Palladium</translation>
     </message>
     <message>
         <source>Silver</source>
         <translation>Stříbro</translation>
     </message>
     <message>
         <source>Cadmium</source>
         <translation>Kadmium</translation>
     </message>
     <message>
         <source>Indium</source>
         <translation>Indium</translation>
     </message>
     <message>
         <source>Tin</source>
         <translation>Cín</translation>
     </message>
     <message>
         <source>Antimony</source>
         <translation>Antimon</translation>
     </message>
     <message>
         <source>Tellurium</source>
         <translation>Tellur</translation>
     </message>
     <message>
         <source>Iodine</source>
         <translation>Jód</translation>
     </message>
     <message>
         <source>Xenon</source>
         <translation>Xenon</translation>
     </message>
     <message>
         <source>Cesium</source>
         <translation>Cesium</translation>
     </message>
     <message>
         <source>Barium</source>
         <translation>Baryum</translation>
     </message>
     <message>
         <source>Lanthanum</source>
         <translation>Lantan</translation>
     </message>
     <message>
         <source>Cerium</source>
         <translation>Cerium</translation>
     </message>
     <message>
         <source>Praseodymium</source>
         <translation>Praseodym</translation>
     </message>
     <message>
         <source>Neodymium</source>
         <translation>Neodym</translation>
     </message>
     <message>
         <source>Promethium</source>
         <translation>Promethium</translation>
     </message>
     <message>
         <source>Samarium</source>
         <translation>Samarium</translation>
     </message>
     <message>
         <source>Europium</source>
         <translation>Europium</translation>
     </message>
     <message>
         <source>Gadolinium</source>
         <translation>Gadolinium</translation>
     </message>
     <message>
         <source>Terbium</source>
         <translation>Terbium</translation>
     </message>
     <message>
         <source>Dysprosium</source>
         <translation>Dysprosium</translation>
     </message>
     <message>
         <source>Holmium</source>
         <translation>Holmium</translation>
     </message>
     <message>
         <source>Erbium</source>
         <translation>Erbium</translation>
     </message>
     <message>
         <source>Thulium</source>
         <translation>Thulium</translation>
     </message>
     <message>
         <source>Ytterbium</source>
         <translation>Ytterbium</translation>
     </message>
     <message>
         <source>Lutetium</source>
         <translation>Lutecium</translation>
     </message>
     <message>
         <source>Hafnium</source>
         <translation>Hafnium</translation>
     </message>
     <message>
         <source>Tantalum</source>
         <translation>Tantal</translation>
     </message>
     <message>
         <source>Tungsten</source>
         <translation>Wolfram</translation>
     </message>
     <message>
         <source>Rhenium</source>
         <translation>Rhenium</translation>
     </message>
     <message>
         <source>Osmium</source>
         <translation>Osmium</translation>
     </message>
     <message>
         <source>Iridium</source>
         <translation>Iridium</translation>
     </message>
     <message>
         <source>Platinum</source>
         <translation>Platina</translation>
     </message>
     <message>
         <source>Gold</source>
         <translation>Zlato</translation>
     </message>
     <message>
         <source>Mercury</source>
         <translation>Rtuť</translation>
     </message>
     <message>
         <source>Thallium</source>
         <translation>Thalium</translation>
     </message>
     <message>
         <source>Lead</source>
         <translation>Olovo</translation>
     </message>
     <message>
         <source>Bismuth</source>
         <translation>Vizmut</translation>
     </message>
     <message>
         <source>Polonium</source>
         <translation>Polonium</translation>
     </message>
     <message>
         <source>Astatine</source>
         <translation>Astat</translation>
     </message>
     <message>
         <source>Radon</source>
         <translation>Radon</translation>
     </message>
     <message>
         <source>Francium</source>
         <translation>Francium</translation>
     </message>
     <message>
         <source>Radium</source>
         <translation>Rádium</translation>
     </message>
     <message>
         <source>Actinium</source>
         <translation>Aktinium</translation>
     </message>
     <message>
         <source>Thorium</source>
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
@@ -1,424 +1,418 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation>Jazyk</translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation>Záložka dokumentů</translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation>Datum a čas</translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation>Osobní informace</translation>
     </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation>Aplikační problém</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation>&lt;p&gt;%1 neodpovídá.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Opravdu chcete násilně ukončit aplikaci?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;p&gt;Rychlé nahrávání bylo pro tuto aplikaci vypnuto.  Stiskněte a podržte ikonu aplikace pro její znovuzapnutí.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; byla přerušena z důvodu signálového kódu %2&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation>Aplikace ukončena</translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation>Aplikace nenalezena</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Nelze nalézt aplikaci &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Nelze nalézt aplikaci %1&lt;/qt&gt;</translation>
     </message>
     <message>
         <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>Pro kalibraci obrazovky stiskněte 
 kříže pevně a přesně.</translation>
     </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation>Stav baterie</translation>
     </message>
     <message>
         <source>Low Battery</source>
         <translation>Slabá baterie</translation>
     </message>
 </context>
 <context>
     <name>FirstUse</name>
     <message>
         <source>&lt;&lt; Back</source>
         <translation>&lt;&lt; Zpět</translation>
     </message>
     <message>
         <source>Next &gt;&gt;</source>
         <translation>Dále &gt;&gt;</translation>
     </message>
     <message>
         <source>Tap anywhere on the screen to continue.</source>
         <translation>Pro pokračování klikněte kamkoliv na plochu.</translation>
     </message>
     <message>
         <source>Please wait, loading %1 settings.</source>
         <translation>Prosím čekejte, nahrávám %1 nastavení.</translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation>Prosím čekejte...</translation>
     </message>
     <message>
         <source>Finish</source>
         <translation>Hotovo</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>Spouštěč</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Dokumenty</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation> - Spouštěč</translation>
     </message>
     <message>
         <source>No application</source>
         <translation>Bez aplikace</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;Pro tento dokument nebyla nastavena žádná aplikace&lt;p&gt;Typ je %1.</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>View as text</source>
         <translation>Zobrazit jako text</translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation>&lt;b&gt;Hledám Dokumenty...&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;Záložka Dokumenty&lt;p&gt;byla vypnutá.&lt;p&gt;Použijte Nastavení-&gt;Spouštěč-&gt;Záložka Dokumenty&lt;p&gt;pro její opětovné zapnutí.&lt;/b&gt;&lt;/center&gt;</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation>Zobrazení s ikonami</translation>
     </message>
     <message>
         <source>List View</source>
         <translation>Zobrazení seznamu</translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>All types</source>
         <translation>Všechny typy</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Zobrazení dokumentů</translation>
     </message>
 </context>
 <context>
     <name>Mediadlg</name>
     <message>
         <source>A new storage media detected:</source>
         <translation>Bylo detekováno nové úložné médium:</translation>
     </message>
     <message>
         <source>What should I do with it?</source>
         <translation>Co bych s ním měl udělat?</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>Konfigurovat toto médium. Změny se projeví až po ukončení této aplikace. Pro obnovení záložky s dokumenty vyndejte a znovu zasuňte toto médium.</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation>Které soubory médií</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Zvuk</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Všechny</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Obrázek</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Text</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation>Omezit hledání na:</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Přidat</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Odstranit</translation>
     </message>
     <message>
         <source>Scan whole media</source>
         <translation>Skenovat celé médium</translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation>Vždy prohledat toto médium</translation>
     </message>
 </context>
 <context>
     <name>QueuedRequestRunner</name>
     <message>
         <source>Processing Queued Requests</source>
         <translation>Zpracovávám nahromaděné požadavky</translation>
     </message>
 </context>
 <context>
     <name>SafeMode</name>
     <message>
         <source>Safe Mode</source>
         <translation>Bezpečný režim</translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation>Správce pluginů...</translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation>Restartovat Qtopii</translation>
     </message>
     <message>
         <source>Help...</source>
         <translation>Pomoc...</translation>
     </message>
 </context>
 <context>
     <name>Server</name>
     <message>
         <source>USB Lock</source>
         <translation>USB zámek</translation>
     </message>
 </context>
 <context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation>Informace</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;Vypadá to, že systémový čas jde špatně.
 (%1)&lt;/p&gt;&lt;p&gt;Chcete hodiny nastavit ?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>WARNING</source>
         <translation>VAROVÁNÍ</translation>
     </message>
     <message>
         <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
         <translation>&lt;p&gt;Stav baterie je kritický!&lt;p&gt;Nechte vypnuto, dokud nepřipojíte zdroj</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>The battery is running very low. </source>
         <translation>Baterie je velmi slabá</translation>
     </message>
     <message>
         <source>&lt;p&gt;The Back-up battery is very low&lt;p&gt;Please charge the back-up battery</source>
         <translation>&lt;p&gt;Záložní baterie je velmi slabá&lt;p&gt;Prosím nabijte záložní baterii</translation>
     </message>
     <message>
         <source>business card</source>
         <translation>vizitka</translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation>Bezpečný režim</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;Nastala chyba při startu systému a ten je nyní v bezpečném režimu. Pluginy se nespouští v tomto režimu. Můžete použít správce pluginů pro vypnutí modulu, který chybu způsobil.</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation>Správce pluginů...</translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation>Stav paměti</translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation>Málo paměti
 Prosím uložte data.</translation>
     </message>
     <message>
         <source>Critical Memory Shortage
 Please end this application
 immediately.</source>
         <translation>Kritický nedostatek paměti.
 Prosím ukončete okamžitě
 tuto aplikaci.</translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Shutdown...</source>
         <translation>Vypnutí...</translation>
     </message>
     <message>
         <source>Terminate</source>
         <translation>Ukončit</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation>Ukončit Opii</translation>
     </message>
     <message>
         <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>
         <translation>&lt;qt&gt;&lt;p&gt;Neautorizovaný systém se pokouší připojit k tomuto zařízení.&lt;p&gt;Vyberte IntelliSync a můžete spojení přijmout, nebo odmítnout.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation>Přijmout</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation>Odmítnout</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;qt&gt;&lt;p&gt;Neautorizovaný systém se pokouší připojit k tomuto zařízení.&lt;p&gt;Jestliže používáte prostředí Qtopia starší než 1.5.1, prosím aktualizujte, nebo změňte bezpečnostní nastavení pro použití IntelliSyncu.&lt;/qt&gt;</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;Neznámé zařízení se pokouší připojit k tomuto zařízení.&lt;p&gt;Jestliže jste spustili synchronizaci poprvé, tak je to normální.</translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Abort</source>
         <translation>Přerušit</translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation>Synchronizace:</translation>
     </message>
 </context>
 </TS>
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
@@ -1,329 +1,266 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoginBase</name>
     <message>
         <source>LoginBase</source>
         <translation>Login báze</translation>
     </message>
     <message>
         <source>Login</source>
         <translation>Přihlášení</translation>
     </message>
     <message>
         <source>Login Automatically</source>
         <translation>Automaticky přihlásit</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>Při aktivaci této volby vás opie-login automaticky přihlásí jako uživatele, kterého jste si vybrali v seznamu.
 
 Pro Zauruse 5x00 je to vždy uživatel &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>Tento seznam vám umožní vybrat uživatele pro automatické přihlášení.
 (Pokud je volba zapnutá).
 
 Můžete vybrat pouze nakonfigurované uživatele.</translation>
     </message>
 </context>
 <context>
     <name>MultiauthConfig</name>
     <message>
         <source>Security configuration</source>
         <translation>Konfigurace zabezpečení</translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>Jaké pluginy nahrát v jakém pořadí:</translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the order they will appear in</source>
         <translation>Zaškrtněte plugin pro jeho aktivaci/deaktivaci, nebo použijte šipku napravo pro změnu pořadí jeho spouštění</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>Posunout nahoru</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>Posunout dolů</translation>
     </message>
     <message>
         <source>plugins</source>
         <translation>pluginy</translation>
     </message>
     <message>
         <source>Authentication</source>
         <translation>Ověření</translation>
     </message>
     <message>
         <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>
         <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-securityplugin-*&lt;/em&gt; package! Once you have done that, you will be able to configure your PDA protection here.</source>
         <translation>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-securitzplugin-*&lt;/em&gt; balíček! Až to uděláte, budete zde schopni nakonfigurovat ochranu vašeho PDA.</translation>
     </message>
 </context>
 <context>
     <name>MultiauthGeneralConfig</name>
     <message>
         <source>When to lock Opie</source>
         <translation>Kdy zamknout Opii</translation>
     </message>
     <message>
         <source>on Opie start</source>
         <translation>při startu Opie</translation>
     </message>
     <message>
         <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>
         <source>Attention</source>
         <translation>Upozornění</translation>
     </message>
     <message>
         <source>You must save your current settings before trying to authenticate. Press OK to accept and launch a simulated authentication process.</source>
         <translation>Musíte uložit vaše nastavení před pokusem o ověření. Klikněte OK pro akceptování a spuštění simulovaného ověření.</translation>
     </message>
     <message>
         <source>If you don&apos;t like the result of this test, don&apos;t forget to change your settings before you exit the configuration application!</source>
         <translation>Jestliže se vám nelíbí výsledek tohoto testu, nezapomeňte změnit vaše nastavení před opuštěním konfigurační aplikace!</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Storno</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
 </context>
 <context>
     <name>SyncBase</name>
     <message>
         <source>SyncBase</source>
         <translation>Sync báze</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>Synchronizace</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation>Akceptovat synchronizaci ze sítě:</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>Vyberte rozsah sítě, nebo zadejte nový.
 
 Tento seznam vám umožní vybrat rozsah sítě, která je oprávněná připojovat se do Zauruse.
 
 Například síťový rozsah 192.168.1.0/24 povolí připojení a synchronizaci jakéhokoliv počítače mezi IP adresami 192.168.1.1 a 192.168.1.254.
 
 Položka &quot;Jakákoliv&quot; umožní připojení *jakékoliv* IP adrese.
 Položka &quot;Žádná&quot; zakáže *všechna* připojení.
 
 Pokud nevíte, vyberte &quot;Jakákoliv&quot;.</translation>
     </message>
     <message>
         <source>Delete Entry</source>
         <translation>Smazat položku</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>Vymaže vybraný síťový rozsah ze seznamu
 
 Po stisknutí tohoto tlačítka bude vybraný síťový rozsah vymazán ze seznamu.
 
 Jestliže stisknete tlačítko omylem, požitím tlačítka &quot;Obnovit výchozí&quot; dostanete
 seznam sítí do stavu jako po prvním nastartování Zauruse.</translation>
     </message>
     <message>
         <source>Restore Defaults</source>
         <translation>Obnovit výchozí</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>Toto tlačítko vrátí seznam sítí do původního
 stavu.
 
 Uvědomte si ale, že všechny zadané rozsahy budou ztraceny!</translation>
     </message>
     <message>
         <source>Select your sync software</source>
         <translation>Vyberte váš synchronizační program</translation>
     </message>
     <message>
         <source>Qtopia 1.7</source>
         <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
@@ -1,369 +1,365 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation>Tato oblast zobrazuje možné testy, výsledky testů, které byly provedeny a hodnoty pro porovnání pro vybrané zařízení. Zaškrtněte testy, které chcete provést.</translation>
     </message>
     <message>
         <source>Tests</source>
         <translation>Testy</translation>
     </message>
     <message>
         <source>Results</source>
         <translation>Výsledky</translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation>Porovnání</translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation>1. Celočíselná aritmetika  </translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation>2. Výpočty s plovoucí čárkou  </translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation>3. Zobrazování textu  </translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation>4. Zobrazování grafiky  </translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation>5. Rychlost paměti RAM  </translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation>6. Rychlost SD karty  </translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation>7. Rychlost CF karty  </translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation>&amp;Start Testů!</translation>
     </message>
     <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>
         <source>Ha</source>
         <translation>Ha</translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation>Tento graf znázorňuje, kolik prostoru je momentálně využito na pevném disku.</translation>
     </message>
     <message>
         <source>SD</source>
         <translation>SD</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation>Tento graf znázorňuje, kolik prostoru je momentálně využito na Secure Digital paměťové kartě.</translation>
     </message>
     <message>
         <source>SC</source>
         <translation>SC</translation>
     </message>
     <message>
         <source>In</source>
         <translation>In</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation>Tento graf znázorňuje, kolik prostoru je momentálně využito v interní (flash) paměti na tomto zařízení.</translation>
     </message>
     <message>
         <source>RA</source>
         <translation>RA</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation>Tento graf znázorňuje, kolik prostoru je momentálně využito na dočasném RAM disku.</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Zatížení CPU aplikacemi (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>Zatížení CPU systémem (%)</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Tato stránka ukazuje vytížení procesoru zařízení.</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Typ:</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation>Tato stránka ukazuje, kolik RAM paměti je alokováno.
 Pamět je rozdělena do těchto kategorií:
 
 1. Použitá - paměť použitá systémem Opie a jinými běžícími aplikacemi.
 2. Buffery - dočasný prostor použitý pro zvýšení výkonu
 3. Cache - informace, které se nedávno použily, ale nebyly ještě uvolněny.
 4. Volná - paměť, která není momentálně ničím nevyužitá.</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Celková paměť: %1 kB</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Použitá (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Buffery (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Cache (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Volná (%1 kB)</translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation>Celkový swap: %1 kB</translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Modul</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Velikost</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Použití#</translation>
     </message>
     <message>
         <source>Used by</source>
         <translation>Používá</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>Toto je seznam modulů do jádra systému, které jsou momentálně nahrány.
 
 Klikněte a podržte na modulu, pokud se chcete dozvědět více, nebo modul uvolnit.</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>Zde vyberete příkaz a potom kliknete na tlačítko Poslat pro poslání příkazu vybranému modulu.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Poslat</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Sem klikněte pro poslání vybraného příkazu modulu označenému výše.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Tato oblast zobrazuje detailní informace o tomto modulu.</translation>
     </message>
     <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation>Opravdu chcete spustit 
 %1 na tento modul?</translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source> : %1 kB</source>
         <translation>: %1 kB</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Použito (%1 kB)</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>Volno (%1 kB)</translation>
     </message>
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Příkaz</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Stav</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Čas</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation>Toto je seznam všech procesů na tomto zařízení.
 
 Klikněte a podržte na procesu, pokud o něm chcete detailní informace, nebo mu chcete poslat signál.</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation>Zde vyberte signál a klikněte na tlačítko Poslat pro poslání signálu tomuto procesu.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Poslat</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation>Sem klikněte pro odeslání vybraného signálu tomuto procesu.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>Tato oblast zobrazuje detailní informace o tomto procesu.</translation>
     </message>
     <message>
         <source>Really want to send %1
 to this process?</source>
         <translation>Opravdu chcete poslat %1
 tomuto procesu?</translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>Informace o systému</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Paměť</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Úložný prostor</translation>
     </message>
     <message>
         <source>CPU</source>
         <translation>CPU</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Proces</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>Moduly</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Verze</translation>
     </message>
     <message>
         <source>Benchmark</source>
         <translation>Výkonnostní testy</translation>
     </message>
     <message>
         <source>Syslog</source>
         <translation>Syslog</translation>
     </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Verze: </translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Kompiloval: </translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Verze: </translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Sestaveno: </translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>&lt;p&gt;Verze: </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;Dodavatel: </translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation>Tato stránka ukazuje aktuální verzi Opie, linuxového jádra a distribuce běžící na tomto kapesním zařízení.</translation>
     </message>
     <message>
         <source>Built against Qt/E </source>
         <translation>Sestaveno proti Qt/E </translation>
     </message>
 </context>
 </TS>
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,69 +1,58 @@
 <!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>
     <message>
         <source>TableViewer - Edit Keys</source>
         <translation>TableViewer - Upravit klíče</translation>
     </message>
     <message>
         <source>Key Name</source>
         <translation>Název klíče</translation>
     </message>
     <message>
         <source>Key Type</source>
         <translation>Typ klíče</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nový</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Smazat</translation>
     </message>
     <message>
         <source>Clear All</source>
         <translation>Vyčistit vše</translation>
     </message>
 </context>
 <context>
     <name>TVListView</name>
     <message>
         <source>List View</source>
         <translation>Zobrazení seznamu</translation>
     </message>
 </context>
 <context>
     <name>TableViewerWindow</name>
     <message>
         <source>Table Viewer</source>
         <translation>Prohlížeč tabulky</translation>
     </message>
     <message>
         <source>could not load Document</source>
         <translation>Nelze nahrát dokument</translation>
     </message>
 </context>
 </TS>
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
@@ -1,146 +1,142 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <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>
         <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;Plugin &apos;%1&apos; způsobil havárii Today. Je možné, že plugin není řádně nainstalován.&lt;br&gt;Today zkusí pokračovat v nahrávání pluginů.&lt;/qt&gt;</translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation>Today</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
         <translation>Today napsal Maximilian Reiß</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>Zde klikněte pro okno s nastavením</translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Today Config</source>
         <translation>Konfigurace Today</translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>V jakém pořadí nahrát jaké pluginy:</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>Pro aktivaci pluginu jej zaškrtněte, nebo použijte šipky na pravé straně pro změnu pořadí spouštění</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>Posunout nahoru</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>Posunout dolů</translation>
     </message>
     <message>
         <source>active/order</source>
         <translation>aktivní/pořadí</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Ostatní</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>Zaškrtněte, pokud se má Today automaticky spustit po probuzení.</translation>
     </message>
     <message>
         <source>autostart on resume?</source>
         <translation>Spustit po probuzení?</translation>
     </message>
     <message>
         <source>tiny banner</source>
         <translation>malý banner</translation>
     </message>
     <message>
         <source>Have small banner </source>
         <translation>Požít malý banner</translation>
     </message>
     <message>
         <source> min</source>
         <translation>min</translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
         <translation>Kolik minut má být PDA uspáno předtím, než ho funkce automatické spuštění probudí</translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation>minut neaktivní</translation>
     </message>
     <message>
         <source> pixel</source>
         <translation>bod</translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
         <translation>Nastavte velikost ikon v bodech</translation>
     </message>
     <message>
         <source>icon size</source>
         <translation>velikost ikon</translation>
     </message>
     <message>
         <source> sec</source>
         <translation>sek</translation>
     </message>
     <message>
         <source>never</source>
         <translation>nikdy</translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
         <translation>Jak často se má Today obnovovat</translation>
     </message>
     <message>
         <source>refresh</source>
         <translation>obnovení</translation>
     </message>
 </context>
 </TS>
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
@@ -1,646 +1,566 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>&lt;h1&gt;Alarm at %1&lt;/h1&gt;&lt;br&gt;</source>
         <translation>&lt;h1&gt;Alarm v %1&lt;/h1&gt;&lt;br&gt;</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Vše</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Nezařazené</translation>
     </message>
 </context>
 <context>
     <name>NewTaskDlg</name>
     <message>
         <source>New Task</source>
         <translation>Nový úkol</translation>
     </message>
     <message>
         <source>Blank task</source>
         <translation>Prázdný úkol</translation>
     </message>
     <message>
         <source>Using template:</source>
         <translation>Použít šablonu:</translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Task Editor</source>
         <translation>Editor úkolů</translation>
     </message>
     <message>
         <source>Information</source>
         <translation>Informace</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Stav</translation>
     </message>
     <message>
         <source>Alarms</source>
         <translation>Alarmy</translation>
     </message>
     <message>
         <source>Recurrence</source>
         <translation>Opakování</translation>
     </message>
 </context>
 <context>
     <name>Opie</name>
     <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.
 Uvolněte nějaké místo
 a zkuste to znovu.
 
 Přesto skončit?</translation>
     </message>
     <message>
         <source>Todo</source>
         <translation>Todo</translation>
     </message>
     <message>
         <source>Data can not be edited, currently syncing</source>
         <translation>Data nelze upravovat, synchronizuje se</translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation>všechny úkoly?</translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation>všechny dokončené úkoly?</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;Bylo přijato %1 nových úkolů.&lt;p&gt;Chcete je přidat do vašeho seznamu úkolů?</translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation>Nové úkoly</translation>
     </message>
     <message>
         <source>Data can&apos;t be edited, currently syncing</source>
         <translation>Data nelze upravovat, synchronizuje se</translation>
     </message>
     <message>
         <source>C.</source>
         <translation>C.</translation>
     </message>
     <message>
         <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>
         <source>Remove</source>
         <translation>Odstranit</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Název</translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation>Nová šablona  %1</translation>
     </message>
     <message>
         <source>Click here to set the priority of new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Klikněte sem pro nastavení priority nového úkolu.
 
 Tato oblast je nazvaná lišta zkratek.
 
 Umožní vám rychle přidat nový úkol do vašeho seznamu. Tuto lištu můžete zobrazit, nebo skrýt nastavením Možnosti-&gt;&apos;Zobrazit lištu zkratek&apos; z menu nahoře.</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>Zadejte sem popis nového úkolu.
 
 Tato oblast je nazvaná lišta zkratek.
 
 Umožní vám rychle přidat nový úkol do vašeho seznamu. Tuto lištu můžete zobrazit, nebo skrýt nastavením Možnosti-&gt;&apos;Zobrazit lištu zkratek&apos; z menu nahoře.</translation>
     </message>
     <message>
         <source>More</source>
         <translation>Více</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>Klikněte sem pro zadání dalších informací o novém úkolu.
 
 Tato oblast je nazvaná lišta zkratek.
 
 Umožní vám rychle přidat nový úkol do vašeho seznamu. Tuto lištu můžete zobrazit, nebo skrýt nastavením Možnosti-&gt;&apos;Zobrazit lištu zkratek&apos; z menu nahoře.</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Vložit</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>Klikněte sem pro přidání nového úkolu.
 
 Tato oblast je nazvaná lišta zkratek.
 
 Umožní vám rychle přidat nový úkol do vašeho seznamu. Tuto lištu můžete zobrazit, nebo skrýt nastavením Možnosti-&gt;&apos;Zobrazit lištu zkratek&apos; z menu nahoře.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Storno</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>Klikněte sem pro resetování informací o novém úkolu.
 
 Tato oblast je nazvaná lišta zkratek.
 
 Umožní vám rychle přidat nový úkol do vašeho seznamu. Tuto lištu můžete zobrazit, nebo skrýt nastavením Možnosti-&gt;&apos;Zobrazit lištu zkratek&apos; z menu nahoře.</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Priorita:</translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>Table View</source>
         <translation>Tabulkové zobrazení</translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation>%1 dnů</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Žádný</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Čas</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nový</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Upravit</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Smazat</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Summary:</source>
         <translation>Shrnutí:</translation>
     </message>
     <message>
         <source>Enter brief description of the task here.</source>
         <translation>Sem zadejte krátký popis úkolu.</translation>
     </message>
     <message>
         <source>Complete </source>
         <translation>Hotovo</translation>
     </message>
     <message>
         <source>Work on </source>
         <translation>Pracovat na</translation>
     </message>
     <message>
         <source>Buy </source>
         <translation>Koupit</translation>
     </message>
     <message>
         <source>Organize </source>
         <translation>Zařadit</translation>
     </message>
     <message>
         <source>Get </source>
         <translation>Vzít</translation>
     </message>
     <message>
         <source>Update </source>
         <translation>Obnovit</translation>
     </message>
     <message>
         <source>Create </source>
         <translation>Vytvořit</translation>
     </message>
     <message>
         <source>Plan </source>
         <translation>Plán</translation>
     </message>
     <message>
         <source>Call </source>
         <translation>Hovor</translation>
     </message>
     <message>
         <source>Mail </source>
         <translation>Mail</translation>
     </message>
     <message>
         <source>Select priority of task here.</source>
         <translation>Zde nastavte prioritu úkolu.</translation>
     </message>
     <message>
         <source>Very High</source>
         <translation>Velmi vysoká</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Vysoká</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normální</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Nízká</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>Velmi nízká</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorie:</translation>
     </message>
     <message>
         <source>Select category to organize this task with.</source>
         <translation>Zařaďte úkol do vybrané kategorie.</translation>
     </message>
     <message>
         <source>Recurring task</source>
         <translation>Opakující se úkol</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>Klikněte sem, jestliže se úkol opakuje. Četnost můžete nastavit na záložce Opakování.</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Popis:</translation>
     </message>
     <message>
         <source>Enter any additional information about this task here.</source>
         <translation>Zadejte sem jakékoliv další informace o tomto úkolu.</translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation>Seznam Todo</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorStatus</name>
     <message>
         <source>Status:</source>
         <translation>Stav:</translation>
     </message>
     <message>
         <source>Click here to set the current status of this task.</source>
         <translation>Klikněte sem pro nastavení aktuálního stavu úkolu.</translation>
     </message>
     <message>
         <source>Started</source>
         <translation>Spuštěno</translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation>Odloženo</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>Dokončeno</translation>
     </message>
     <message>
         <source>Not started</source>
         <translation>Nespuštěno</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Průběh:</translation>
     </message>
     <message>
         <source>Select progress made on this task here.</source>
         <translation>Nastavte procento dokončení tohoto úkolu.</translation>
     </message>
     <message>
         <source>0 %</source>
         <translation>0 %</translation>
     </message>
     <message>
         <source>20 %</source>
         <translation>20 %</translation>
     </message>
     <message>
         <source>40 %</source>
         <translation>40 %</translation>
     </message>
     <message>
         <source>60 %</source>
         <translation>60 %</translation>
     </message>
     <message>
         <source>80 %</source>
         <translation>80 %</translation>
     </message>
     <message>
         <source>100 %</source>
         <translation>100 %</translation>
     </message>
     <message>
         <source>Start Date:</source>
         <translation>Datum spuštění:</translation>
     </message>
     <message>
         <source>Click here to set the date this task was started.</source>
         <translation>Klikněte sem pro nastavení data spuštění úkolu.</translation>
     </message>
     <message>
         <source>Due Date:</source>
         <translation>Datum dokončení:</translation>
     </message>
     <message>
         <source>Click here to set the date this task needs to be completed by.</source>
         <translation>Klikněte sem pro nastavení plánovaného data dokončení úkolu.</translation>
     </message>
     <message>
         <source>Completed:</source>
         <translation>Dokončeno:</translation>
     </message>
     <message>
         <source>Click here to mark this task as completed.</source>
         <translation>Klikněte sem pro označení úkolu jako dokončeného.</translation>
     </message>
     <message>
         <source>Click here to set the date this task was completed.</source>
         <translation>Klikněte sem pro nastavení data skutečného dokončení úkolu.</translation>
     </message>
     <message>
         <source>Maintainer Mode:</source>
         <translation>Role správce:</translation>
     </message>
     <message>
         <source>Click here to set the maintainer&apos;s role.</source>
         <translation>Klikněte sem pro výběr role správce.</translation>
     </message>
     <message>
         <source>Nothing</source>
         <translation>Žádná</translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation>Odpovědná</translation>
     </message>
     <message>
         <source>Done By</source>
         <translation>Tvůrčí</translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation>Koordinující</translation>
     </message>
     <message>
         <source>Maintainer:</source>
         <translation>Správce:</translation>
     </message>
     <message>
         <source>This is the name of the current task maintainer.</source>
         <translation>Toto je jméno aktuálního správce úkolu.</translation>
     </message>
     <message>
         <source>test</source>
         <translation>test</translation>
     </message>
     <message>
         <source>Click here to select the task maintainer.</source>
         <translation>Klikněte sem pro výběr správce úkolu.</translation>
     </message>
 </context>
 </TS>
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
@@ -1,645 +1,579 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Ikona</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Pole 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Pole 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Pole 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Pole 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Pole 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Pole 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Informace:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Nová položka</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Komentář</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Pole 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Pole 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Heslo</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Uživatelské jméno</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Název</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Heslo</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Soubor</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Filtr typu souborů</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation>Rámeček filtru typu souborů
 
 upravit nebo vybrat filtr</translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation>Potvrdní výběr a zavře formulář</translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation>Tlačítko OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation>stornuje výběr a zavře formulář</translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation>Tlačítko Storno</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation>Zobrazí vybraný název souboru</translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation>Řádka s názvem souboru
 
 zobrazí vybraný soubor
 a umožní přímou úpravu názvu
 souboru</translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation>Rámeček adresář
 úprava, nebo výběr názvu adresáře</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Jméno</translation>
     </message>
     <message>
         <source>size</source>
         <translation>velikost</translation>
     </message>
     <message>
         <source>type</source>
         <translation>typ</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>seznam adresářů</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation>Seznam Adresářů
 
 zobrazí seznam adresářů a souborů</translation>
     </message>
     <message>
         <source></source>
         <translation></translation>
     </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation>adresář</translation>
     </message>
     <message>
         <source>file</source>
         <translation>soubor</translation>
     </message>
     <message>
         <source>link</source>
         <translation>link</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Hledat</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Uživatelské jméno</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Název</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Komentář</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <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>
         <source>&amp;Save document</source>
         <translation>&amp;Uložit dokument</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
         <translation>U&amp;ložit dokument s novým heslem</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
         <translation>&amp;Export do textového souboru</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
         <translation>&amp;Import z textového souboru</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
         <translation>&amp;Odstranit textový soubor</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
         <translation>&amp;Otevřít položky rozvinuté</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
         <translation>K&amp;onec</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Soubor</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Nový</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Upravit</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Smazat</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Vyjmout</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>K&amp;opírovat</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Vložit</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Hledat</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Položka</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;O aplikaci</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Nápověda</translation>
     </message>
     <message>
         <source>New entry</source>
         <translation>Nová položka</translation>
     </message>
     <message>
         <source>Edit category or entry</source>
         <translation>Upravit kategorii, nebo položku</translation>
     </message>
     <message>
         <source>Delete category or entry</source>
         <translation>Smazat kategorii, nebo položku</translation>
     </message>
     <message>
         <source>Find entry</source>
         <translation>Hledat položku</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Název</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Pole 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Pole 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Komentář</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Pole 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Pole 5</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Všechno</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Text</translation>
     </message>
     <message>
         <source>Remove text file</source>
         <translation>Odstranit textový soubor</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
         <translation>Nelze odstranit textový soubor.</translation>
     </message>
     <message>
         <source>No document defined.
 You have to create a new document</source>
         <translation>Dokument nebyl definován.
 Vytvořte nový dokument</translation>
     </message>
     <message>
         <source>Export text file</source>
         <translation>Export do textového souboru</translation>
     </message>
     <message>
         <source>Import text file</source>
         <translation>Import z textového souboru</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
         <translation>Nelze exportovat do textového souboru.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
         <translation>Nelze importovat textový soubor.</translation>
     </message>
     <message>
         <source>Enter Password</source>
         <translation>Zadejte heslo</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
         <translation>Špatné heslo.
 
 ZSafe se nyní ukončí.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
         <translation>Špatné heslo.
 Zkusit znovu?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Ano</translation>
     </message>
     <message>
         <source>&amp;No.</source>
         <translation>&amp;Ne.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
         <translation>Prázdný dokument,
 nebo špatné heslo.
 Pokračovat?</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;Ne</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
         <translation>&amp;Ano.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
         <translation>Heslo je prázdné.
 Zadejte ho znovu.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
         <translation>Opakujte heslo</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
         <translation>Hesla musí být identická.
 Zadejte ho znovu.</translation>
     </message>
     <message>
         <source>Do you want to save </source>
         <translation>Chcete uložit změny</translation>
     </message>
     <message>
         <source>
 before continuing?</source>
         <translation>
 před pokračováním?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation>&amp;Uložit</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
         <translation>&amp;Neukládat</translation>
     </message>
     <message>
         <source>Password file saved.</source>
         <translation>Soubor s hesly uložen.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
         <translation>Chcete uložit změny
 před ukončením?</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
         <translation>U&amp;ložit s
 novým
 heslem</translation>
     </message>
     <message>
         <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>
         <source>&lt;P&gt;You must create a new document first. Ok to create?&lt;/P&gt;</source>
         <translation>&lt;P&gt;Musíte nejdříve vytvořit nový dokument. Vytvořit?&lt;/P&gt;</translation>
     </message>
     <message>
         <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Password Manager&lt;br&gt;ZSafe version 2.1.2&lt;br&gt;&lt;/b&gt;by Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Translations by Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus správce hesel&lt;br&gt;ZSafe verze 2.1.2&lt;br&gt;&lt;/b&gt;vytvořil Carsten
 Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Přeložil Robert
 Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <source>Copy to Clipboard</source>
         <translation>Kopírovat do schránky</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Upravit</translation>
     </message>
     <message>
         <source>Show Info</source>
         <translation>Zobrazit Info</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Storno</translation>
     </message>
 </context>
 </TS>
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
@@ -1,568 +1,488 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation>Fuldt navn</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Kontakt</translation>
     </message>
     <message>
         <source>Pick</source>
         <translation>Vælg</translation>
     </message>
 </context>
 <context>
     <name>AbView</name>
     <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>
         <source>&amp;Yes</source>
         <translation>&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;Nej</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>Tilføj kontakt?</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %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>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Kunne ikke gemme information.
 Frigør noget lagerplads
 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>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Configuration</source>
         <translation>Indstillinger</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Blandet</translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation>Søge indstillinger</translation>
     </message>
     <message>
         <source>Query Style</source>
         <translation>Forespørgsels metode</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>Brug regulære udtryk</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>Brug wildcards (*,?)</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Versalfølsom</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Skrifttype</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Lille</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Stor</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Post</translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation>Foretræk QT-Mail</translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation>Foretræk Opie-Mail</translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation>Bemærk: QT-Mail kan
 kun fås fra SHARP
 standard ROM&apos;en.
 Opie-Mail fås gratis!</translation>
     </message>
     <message>
         <source>Order</source>
         <translation>Rækkefølge</translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation>Vælg kontakt rækkefølgen:</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Op</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Ned</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Tilføj</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Fjern</translation>
     </message>
     <message>
         <source>Click on tab to select one</source>
         <translation>Klik på fanen for at vælge den</translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation>Indstilling af søge metoder</translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation>Søgefunktionen forventer regulære udtryk hvis denne er valgt</translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
         <translation>Søgefunktionen forventer kun simple wildcards</translation>
     </message>
     <message>
         <source>If selected, search differs between upper and lower chars</source>
         <translation>Hvis valgt, skelner søgningen mellem store og små bogstaver</translation>
     </message>
     <message>
         <source>Font size for list- and card view</source>
         <translation>Skrift størrelse for liste og kort visning</translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
         <translation>Skrift indstillinger for liste og kort visning</translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation>Brug Sharp&apos;s mail program hvis det er tilgengæligt</translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</source>
         <translation>Brug OPIE mail hvis det er installeret</translation>
     </message>
     <message>
         <source>Move selected attribute one line up</source>
         <translation>Flyt den valgte attribut en linie op</translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation>Flyt den valgte attribut en linie ned</translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation>Liste over alle mulige attributter</translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation>Tilføj den valgte attribut fra listen herunder til den øverste liste</translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation>Fjern den valgte attribut fra den øverste liste</translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation>Rækkefølge (op -&gt; ned) definerer den primære kontakt vist i den anden kolonne i listen</translation>
     </message>
     <message>
         <source>Tool-/Menubar</source>
         <translation>Værktøjs-/Menulinje</translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation>Faste</translation>
     </message>
     <message>
         <source>Switch to fixed menu-/toolbars after restarting application !</source>
         <translation>Skift til faste menu-/værktøjslinjer efter programmet er genstartet!</translation>
     </message>
     <message>
         <source>Moveable</source>
         <translation>Flytbare</translation>
     </message>
     <message>
         <source>Switch to moveable menu-/toolbars after restarting application !</source>
         <translation>Skift til flytbare menu-/værktøjslinjer efter programmet er genstartet!</translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Full Name...</source>
         <translation>Fuldt navn...</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Job titel</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Organisation</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Gem som</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategori</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Noter...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Generel</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Arbejde</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Hjem</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Adresse</translation>
     </message>
     <message>
         <source>City</source>
         <translation>By</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Stat</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>Postnummer</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>Land</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>USA</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Storbritannien</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation>Albanien</translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation>Algeriet</translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation>Amerikansk Samoa</translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation>Andorra</translation>
     </message>
     <message>
         <source>Angola</source>
         <translation>Angola</translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation>Anguilla</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>Argentina</translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation>Aruba</translation>
     </message>
     <message>
         <source>Australia</source>
         <translation>Australien</translation>
     </message>
     <message>
         <source>Austria</source>
         <translation>Østrig</translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation>Azerbaijan</translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation>Bahama</translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation>Bahrain</translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation>Bangladesh</translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation>Barbados</translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation>Hviderusland</translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation>Belgien</translation>
     </message>
     <message>
         <source>Belize</source>
         <translation>Belize</translation>
     </message>
     <message>
         <source>Benin</source>
         <translation>Benin</translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation>Bermuda</translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation>Bhutan</translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation>Botswana</translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation>Bouvetø</translation>
     </message>
     <message>
         <source>Brazil</source>
         <translation>Brasilien</translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
         <translation>Brunei</translation>
     </message>
     <message>
         <source>Bulgaria</source>
         <translation>Bulgarien</translation>
     </message>
     <message>
         <source>Burkina Faso</source>
         <translation>Burkina Faso</translation>
     </message>
     <message>
         <source>Burundi</source>
         <translation>Burundi</translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation>Cambodja</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>Canada</translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation>Cape Verde</translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation>Cayman-øerne</translation>
     </message>
     <message>
         <source>Chad</source>
         <translation>Chad</translation>
     </message>
     <message>
@@ -1012,552 +932,385 @@ Opie-Mail fås gratis!</translation>
     <message>
         <source>Puerto Rico</source>
         <translation>Puerto Rico</translation>
     </message>
     <message>
         <source>Qatar</source>
         <translation>Qatar</translation>
     </message>
     <message>
         <source>Reunion</source>
         <translation>Réunion</translation>
     </message>
     <message>
         <source>Romania</source>
         <translation>Rumænien</translation>
     </message>
     <message>
         <source>Russia</source>
         <translation>Rusland</translation>
     </message>
     <message>
         <source>Rwanda</source>
         <translation>Rwanda</translation>
     </message>
     <message>
         <source>Saint Lucia</source>
         <translation>St. Lucia</translation>
     </message>
     <message>
         <source>Samoa</source>
         <translation>Samoa</translation>
     </message>
     <message>
         <source>San Marino</source>
         <translation>San Marino</translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
         <translation>Saudi-Arabien</translation>
     </message>
     <message>
         <source>Senegal</source>
         <translation>Senegal</translation>
     </message>
     <message>
         <source>Seychelles</source>
         <translation>Seychellerne</translation>
     </message>
     <message>
         <source>Sierra Leone</source>
         <translation>Sierra Leone</translation>
     </message>
     <message>
         <source>Singapore</source>
         <translation>Singapore</translation>
     </message>
     <message>
         <source>Slovakia</source>
         <translation>Slovakiet</translation>
     </message>
     <message>
         <source>Slovenia</source>
         <translation>Slovenien</translation>
     </message>
     <message>
         <source>Solomon Islands</source>
         <translation>Solomon-øerne</translation>
     </message>
     <message>
         <source>Somalia</source>
         <translation>Somalia</translation>
     </message>
     <message>
         <source>South Africa</source>
         <translation>Sydafrika</translation>
     </message>
     <message>
         <source>Spain</source>
         <translation>Spanien</translation>
     </message>
     <message>
         <source>Sri Lanka</source>
         <translation>Sri Lanka</translation>
     </message>
     <message>
         <source>St. Helena</source>
         <translation>St. Helena</translation>
     </message>
     <message>
         <source>Sudan</source>
         <translation>Sudan</translation>
     </message>
     <message>
         <source>Suriname</source>
         <translation>Suriname</translation>
     </message>
     <message>
         <source>Swaziland</source>
         <translation>Swaziland</translation>
     </message>
     <message>
         <source>Sweden</source>
         <translation>Sverige</translation>
     </message>
     <message>
         <source>Switzerland</source>
         <translation>Schweiz</translation>
     </message>
     <message>
         <source>Taiwan</source>
         <translation>Taiwan</translation>
     </message>
     <message>
         <source>Tajikistan</source>
         <translation>Tajikistan</translation>
     </message>
     <message>
         <source>Tanzania</source>
         <translation>Tanzania</translation>
     </message>
     <message>
         <source>Thailand</source>
         <translation>Thailand</translation>
     </message>
     <message>
         <source>Togo</source>
         <translation>Togo</translation>
     </message>
     <message>
         <source>Tokelau</source>
         <translation>Tokelau</translation>
     </message>
     <message>
         <source>Tonga</source>
         <translation>Tonga</translation>
     </message>
     <message>
         <source>Tunisia</source>
         <translation>Tunesien</translation>
     </message>
     <message>
         <source>Turkey</source>
         <translation>Tyrkiet</translation>
     </message>
     <message>
         <source>Turkmenistan</source>
         <translation>Turkmenistan</translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation>Tuvalu</translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation>Uganda</translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation>Ukraine</translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation>Uruguay</translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation>Uzbekistan</translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation>Vanuatu</translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation>Venezuela</translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation>Vestindiske Øer</translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation>Vestsahara</translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation>Yemen</translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation>Jugoslavien</translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation>Zambia</translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation>Zimbabwe</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Fødselsdag</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Slet</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Årsdag</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Køn</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Mand</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Kvinde</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Detaljer</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>Indtast note</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>Rediger navn</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Fornavn</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Mellemnavn</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Efternavn</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Suffiks</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Kontakter</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Ukendt</translation>
     </message>
     <message>
         <source>Afghanistan</source>
         <translation>Afghanistan</translation>
     </message>
     <message>
         <source>Antarctica</source>
         <translation>Antarktis</translation>
     </message>
     <message>
         <source>Armenia</source>
         <translation>Armenien</translation>
     </message>
     <message>
         <source>Bolivia</source>
         <translation>Bolivia</translation>
     </message>
     <message>
         <source>Cameroon</source>
         <translation>Cameroun</translation>
     </message>
     <message>
         <source>Ghana</source>
         <translation>Ghana</translation>
     </message>
     <message>
         <source>Guadeloupe</source>
         <translation>Guadeloupe</translation>
     </message>
     <message>
         <source>Guinea-Bissau</source>
         <translation>Guinea-Bissau</translation>
     </message>
     <message>
         <source>Jamaica</source>
         <translation>Jamaica</translation>
     </message>
     <message>
         <source>Kiribati</source>
         <translation>Kiribati</translation>
     </message>
     <message>
         <source>Kyrgyzstan</source>
         <translation>Kirgisistan</translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
         <translation>Palæstinensiske selvstyre områder</translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
         <translation>Pitcairn</translation>
     </message>
     <message>
         <source>Vietnam</source>
         <translation>Vietnam</translation>
     </message>
     <message>
         <source>Press to enter last- middle and firstname</source>
         <translation>Tryk for at indtaste efter-, mellem- og fornavn</translation>
     </message>
     <message>
         <source>Enter fullname directly ! If you have a lastname with multiple words ( for instance &quot;de la Guerra&quot;), please write &lt;lastname&gt;,&lt;firstnames&gt; like this: &quot;de la Guerra, Carlos Pedro&quot;</source>
         <translation>Indtast hele navnet direkte! Hvis du har et efternavn bestående af flere ord (f.eks. &quot;de la Guerra&quot;), så skriv &lt;efternavn&gt;, &lt;fornavne&gt; sådan: &quot;de la Guerra, Carlos Pedro&quot;</translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation>Stillingsbetegnelse..</translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation>Noget i retning af &quot;jr.&quot;..</translation>
     </message>
     <message>
         <source>The working place of the contact</source>
         <translation>Arbejdsstedet for kontakten</translation>
     </message>
     <message>
         <source>Press to select attribute to change</source>
         <translation>Tryk for at vælge attributten du vil ændre</translation>
     </message>
     <message>
         <source>Press to select how to store the name (and howto show it in the listview)</source>
         <translation>Tryk for at vælge hvordan navnet skal gemmes (og hvordan det skal vises i liste visningen)</translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie</name>
     <message>
         <source>Contact</source>
         <translation type="unfinished">Kontakt</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation type="unfinished">Kontakter</translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation type="unfinished">Start søgning</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation type="unfinished">Skriv mail til</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation type="unfinished">Importer vCard</translation>
     </message>
     <message>
         <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,445 +1,361 @@
 <!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>
         <source>Open as text</source>
         <translation>Åben som tekst</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Handlinger</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>Opret mappe</translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation>Opret genvej</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Omdøb</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Kopier</translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation>Kopier som</translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation>Kopier samme mappe</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>Flyt</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Slet</translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation>Tilføj til dokumenter</translation>
     </message>
     <message>
         <source>Run Command</source>
         <translation>Kør kommando</translation>
     </message>
     <message>
         <source>File Info</source>
         <translation>Fil info</translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation>Indstil rettigheder</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Egenskaber</translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation>Send fil</translation>
     </message>
     <message>
         <source>AdvancedFm</source>
         <translation>Filstyring</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Fil</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Vis</translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation>Kør kommando med output</translation>
     </message>
     <message>
         <source>Select All</source>
         <translation>Vælg alle</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Størrelse</translation>
     </message>
     <message>
         <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>
         <source>Switch to View 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not Yet Implemented</source>
         <translation type="unfinished"></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>
         <source>Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1 files?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1 and all it&apos;s contents?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really copy %1 files?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 already  exists. Ok to overwrite?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Could not copy %1 to %2&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy %1 As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt; %1 already exists. Ok to overwrite?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not copy %1 to %2&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt; %1 already exists. Do you really want to delete it?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not move %1&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not copy %1 to %2&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Output</source>
         <translation>Output</translation>
     </message>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Gem output i filen (kun navn)</translation>
     </message>
     <message>
         <source>Process could not start</source>
         <translation>Processen kunne ikke starte</translation>
     </message>
     <message>
         <source>Error
 </source>
         <translation>Fejl
 </translation>
     </message>
     <message>
         <source>
 Finished
 </source>
         <translation>
 Afsluttet
 </translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Indstil fil-rettighederne</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Indstil fil-rettighederne for:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>ejer</translation>
     </message>
     <message>
         <source>group</source>
         <translation>gruppe</translation>
     </message>
     <message>
         <source>others</source>
         <translation>andre</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Ejer</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Gruppe</translation>
     </message>
     <message>
         <source>read</source>
         <translation>læse</translation>
     </message>
     <message>
         <source>write</source>
         <translation>skrive</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>køre</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Advarsel</translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation>Fejl- ingen bruger</translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation>Fejl- ingen gruppe</translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation>Der opstod fejl under indstilling af ejerforhold</translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation>Der opstod fejl under indstilling af rettigheder</translation>
     </message>
     <message>
         <source>filePermissions</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,293 +1,233 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Appearance</name>
     <message>
         <source>Settings...</source>
         <translation>Indstillinger...</translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation>Nuværende skema</translation>
     </message>
     <message>
         <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>
         <source>Drop down list</source>
         <translation>Drop-down liste</translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation>Drop-down liste m. ikoner</translation>
     </message>
     <message>
         <source>Top</source>
         <translation>Top</translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation>Bund</translation>
     </message>
     <message>
         <source>Style</source>
         <translation>Stil</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Skrifttype</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Farver</translation>
     </message>
     <message>
         <source>Windows</source>
         <translation>Vinduer</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Advanceret</translation>
     </message>
     <message>
-        <source>Restart</source>
-        <translation 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.
 
 Note: Denne mulighed er ikke tilgængelig ved alle stil-arter.</translation>
     </message>
     <message>
         <source>Window decorations control the way the application title bar and its buttons appear.
 
 Click here to select an available decoration.</source>
         <translation>Vindues udsmykninger styrer måden som program titelbjælken og dens knapper vises.
 
 Klik her for at vælge en tilgængelig udsmykning.</translation>
     </message>
     <message>
         <source>Select the desired name, style and size of the default font applications will use.</source>
         <translation>Vælg det ønskede navn, stil-art og størrelse af den standard skrifttype programmerne skal bruge.</translation>
     </message>
     <message>
         <source>Color schemes are a collection of colors which are used for various parts of the display.
 
 Click here to select an available scheme.</source>
         <translation>Farveskemaer er en samling af farver som bruge til forskellige dele af skærmen.
 
 Klik her for at vælge et tilgængeligt skema.</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation>Klik her så faner vises øverst i vinduet.</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation>Klik her så faner vises nederst i vinduet.</translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation>Dette er et eksempel vindue. Brug dette til at se det nye udseende når du ændrer på indstillingerne.</translation>
     </message>
     <message>
         <source>Appearance Settings</source>
         <translation>Udseende indstillinger</translation>
     </message>
     <message>
         <source>Rotation direction:</source>
         <translation>Rotationsretning:</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>
         <translation>Redigér skema</translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation>Klik her for at vælge en farve til: </translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
         <translation>Eksempel</translation>
     </message>
     <message>
         <source>Normal Item</source>
         <translation>Normalt element</translation>
     </message>
     <message>
         <source>Disabled Item</source>
         <translation>Deaktiveret element</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Menu</translation>
     </message>
     <message>
         <source>Normal Text</source>
         <translation>Normal tekst</translation>
     </message>
     <message>
         <source>Highlighted Text</source>
         <translation>Valgt tekst</translation>
     </message>
     <message>
         <source>Button</source>
         <translation>Knap</translation>
     </message>
     <message>
         <source>Check Box</source>
         <translation>Afkrydsningsfelt</translation>
     </message>
     <message>
         <source>Sample window using the selected settings.</source>
         <translation>Eksempel vindue ved brug af de nuværende indstillinger.</translation>
     </message>
 </context>
 </TS>
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
@@ -1,694 +1,666 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation>Kategorifilter</translation>
     </message>
     <message>
         <source>Select one or more groups</source>
         <translation>Vælg én eller flere grupper</translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation>Læser konfiguration...</translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Afbryd</translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
         <translation>Luk</translation>
     </message>
     <message>
         <source>Remove
 </source>
         <translation>Fjern</translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation>Installer</translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation>Opgrader</translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation>(Geninstaller)</translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation>(Opgrader)</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation>Destination</translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation>Ledig plads</translation>
     </message>
     <message>
         <source>Output</source>
         <translation type="unfinished">Output</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Start</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Indstillinger</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Tekst</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation>Afbryd</translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation>
 **** Brugeren klikkede AFBRYD ***</translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation>**** Process afbrudt ****</translation>
     </message>
     <message>
         <source>Save output</source>
         <translation type="unfinished">Gem output</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Ukendt</translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation>%1 Kb</translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation type="unfinished">Indstillinger</translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished">--force-depends</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished">--force-reinstall</translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished">--force-removal</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished">--force-overwrite</translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation>Informationsniveau</translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation>Kun fejl</translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation>Almindelige meddelelser</translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation>Oplysende meddelelser</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation>Meddelelser til fejlfinding</translation>
     </message>
 </context>
 <context>
     <name>Ipkg</name>
     <message>
         <source>Dealing with package %1</source>
         <translation type="unfinished">Håndterer pakken %1</translation>
     </message>
     <message>
         <source>Removing symbolic links...
 </source>
         <translation>Fjerner symbolske links...
 </translation>
     </message>
     <message>
         <source>Creating symbolic links for %1.</source>
         <translation type="unfinished">Laver symlinks til%1.</translation>
     </message>
     <message>
         <source>Creating symbolic links for %1</source>
         <translation type="unfinished">Laver symlinks til %1</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>Færdig</translation>
     </message>
     <message>
         <source>Removing status entry...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>status file - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>package - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation>AQPkg - Pakkestyring</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation>Indtast teksten du vil søge efter her.</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation>Klik her for at gemme Quick Jump værktøjslinien.</translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation>Opdatér lister</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation>Klik her for at opdatere pakke lister fra serverne.</translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation>Opgradér</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation>Klik her for at opgradere alle installerede pakker, hvis en nyere version er tilgængelig.</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Hent</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation>Klik her for at hente den/de valgte pakke(r).</translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation>Anvend ændringer</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation>Klik her for at installere, fjerne eller opgradere den/de valgte pakke(r).</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Handlinger</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation>Vis pakker der ikke er installeret</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation>Klik her for at vise de tilgængelige pakker der ikke er installeret.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation>Vis installerede pakker</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation>Klik her for at vise de pakker der er installeret på denne enhed.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation>Vis opdaterede pakker</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation>Klik her for at vise de pakker der er installeret på denne enhed, hvor en nyere version er tilgængelig.</translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation>Filtrér efter kategori</translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation>Klik her for at vise pakker tilhørende en bestemt kategori.</translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation>Vælg filter kategori</translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation>Klik her for at ændre den kategori der skal bruges til filteret.</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Find</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation>Klik her for at søge efter tekst i pakke navnene.</translation>
     </message>
     <message>
         <source>Find next</source>
         <translation>Find næste</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation>Klik her for at finde det næste pakke navn indeholdende den tekst du søger efter.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation>Quick Jump tastplade</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation>Klik her for at vise/skjule tastpladen for hurtig søgning i pakke listen.</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Vis</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Konfigurér</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation>Klik her for at konfigurere dette program.</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation>Klik her for at skjule søge værktøjslinien.</translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation>Servere:</translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation>Klik her for at vælge et pakke feed.</translation>
     </message>
     <message>
         <source>Packages</source>
         <translation>Pakker</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 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>Dette er en liste over alle pakker fra det server feed der er valgt foroven.
 
 En blå prik ved siden af pakke navnet indikerer at pakken allerede er installeret.
 
 En blå prik med en stjerne indikerer at en nyere version af pakken er tilgængelig fra det valgte server feed.
 
 Klik inde i boksen til venstre for at vælge en pakke.</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Fjern</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation>Klik her for at afinstallere den/de valgte pakke(r).</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation>Bygger server liste:
 <byte value="x9"/>%1</translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation>Bygger pakke liste for:
 <byte value="x9"/>%1</translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
         <translation>Genopfrisker server pakke lister</translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation>ADVARSEL: Opgradering mens
 Opie/Qtopia kører
 er IKKE anbefalet!
 
 Er du sikker?
 </translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Advarsel</translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
         <translation>Opgraderer installerede pakker</translation>
     </message>
     <message>
         <source>Are you sure you wish to delete
 %1?</source>
         <translation>Er du sikker på du vil slette
 %1?</translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation>Er du sikker?</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nej</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
         <source>Download to where</source>
         <translation>Hent hvortil</translation>
     </message>
     <message>
         <source>Enter path to download to</source>
         <translation>Indtast stien der skal hentes til</translation>
     </message>
     <message>
         <source>Install Remote Package</source>
         <translation>Installér fjernpakke</translation>
     </message>
     <message>
         <source>Enter package location</source>
         <translation>Indtast pakkens lokation</translation>
     </message>
     <message>
         <source>Nothing to do</source>
         <translation>Intet at lave</translation>
     </message>
     <message>
         <source>No packages selected</source>
         <translation>Ingen pakker er valgt</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Do you wish to remove or reinstall
 %1?</source>
         <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>
         <translation type="unfinished">&lt;p&gt;&lt;b&gt;Installeret i&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Størrelse&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Sektion&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Filnavn&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Version installeret&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Version tilgængelig&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>Package Information</source>
         <translation>Pakkeinformation</translation>
     </message>
     <message>
         <source>Package information is unavailable</source>
         <translation>Pakkeinformation er ikke tilgængelig</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Luk</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Installed packages</source>
         <translation>Installerede pakker</translation>
     </message>
     <message>
         <source>Local packages</source>
         <translation>Lokale pakker</translation>
     </message>
     <message>
         <source>N/A</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package - %1
               version - %2</source>
         <translation>Pakke - %1 version - %2</translation>
     </message>
     <message>
         <source>
               inst version - %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Version string is empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Epoch in version is not number.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nothing after colon in version number.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QuestionDlg</name>
     <message>
         <source>Remove</source>
         <translation>Fjern</translation>
     </message>
 </context>
 <context>
     <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation>Konfiguration</translation>
     </message>
     <message>
         <source>Servers</source>
         <translation>Servere</translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation>Destinationer</translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation>Proxyer</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Ny</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Slet</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Navn:</translation>
     </message>
     <message>
         <source>Address:</source>
         <translation>Adresse:</translation>
     </message>
     <message>
         <source>Active Server</source>
         <translation>Aktiv server</translation>
     </message>
     <message>
         <source>Update</source>
         <translation>Opdater</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation>Destination</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Placering:</translation>
     </message>
     <message>
         <source>Link to root</source>
         <translation></translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
         <translation>HTTP Proxy</translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="unfinished">Aktiveret</translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation>FTP Proxy</translation>
     </message>
     <message>
         <source>Username:</source>
         <translation>Brugernavn:</translation>
     </message>
     <message>
         <source>Password:</source>
         <translation>Kodeord:</translation>
     </message>
 </context>
 </TS>
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,164 +1,148 @@
 <!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>
     <message>
         <source>Backup Failed!</source>
         <translation>Fejl! Der er ikke taget backup.</translation>
     </message>
     <message>
         <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>
         <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>
         <source>Restore Backup...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;%1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore</source>
         <translation type="unfinished">Gendan</translation>
     </message>
     <message>
         <source>Would you really overwrite your local data?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <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>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ErrorDialog</name>
     <message>
         <source>Error Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error Message:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
 </context>
 </TS>
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,339 +1,331 @@
 <!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>
         <source>CE</source>
         <translation>CE</translation>
     </message>
     <message>
         <source>log</source>
         <translation>log</translation>
     </message>
     <message>
         <source>ln</source>
         <translation>ln</translation>
     </message>
     <message>
         <source>(</source>
         <translation>(</translation>
     </message>
     <message>
         <source>)</source>
         <translation>)</translation>
     </message>
     <message>
         <source>sin</source>
         <translation>sin</translation>
     </message>
     <message>
         <source>cos</source>
         <translation>cos</translation>
     </message>
     <message>
         <source>tan</source>
         <translation>tan</translation>
     </message>
     <message>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
         <source>+/-</source>
         <translation>+/-</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>=</source>
         <translation>=</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>.</source>
         <translation>.</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <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>
         <source>Distance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>acres</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&#xb0;C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>carats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&#xb0;F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>fl oz (US)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>g</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>gal (US)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>hectares</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>km</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>l</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>lb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lg tons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ml</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>naut. mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>oz</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>pt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>qt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq km</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq yd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>St tons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tblspoon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>teaspoons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tonnes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>yd</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,754 +1,646 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation>Checkhæfte</translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation>Nyt checkhæfte</translation>
     </message>
     <message>
         <source>Info</source>
         <translation>Information</translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation>Transaktioner</translation>
     </message>
     <message>
         <source>Charts</source>
         <translation>Diagrammer</translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation>Beskyttet med kodeord</translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation>Klik her for at slå beskyttelse med kodeord til eller fra.</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Navn:</translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation>Skriv navnet på checkhæftet her.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Type:</translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation>Vælg checkhæfte-typen her.</translation>
     </message>
     <message>
-        <source>Savings</source>
-        <translation 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>
         <source>Enter account number for this checkbook here.</source>
         <translation>Skriv kontonummer for checkhæftet her.</translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation>PIN kode:</translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation>Skriv checkhæftets pinkode her.</translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation>Startsaldo:</translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation>Skriv checkhæftets startsaldo her.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notater:</translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation>Skriv yderligere informationer for checkhæftet her.</translation>
     </message>
     <message>
-        <source>Current balance: %10.00</source>
-        <translation 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>
         <source>Date</source>
         <translation>Dato</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Beskrivelse</translation>
     </message>
     <message>
         <source>Amount</source>
         <translation>Beløb</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Ny</translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation>Klik her for at tilføje en ny transaktion.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Rediger</translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation>Vælg en transaktion, og klik her for at redigere den.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Slet</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation>Vælg et checkhæfte og klik her for at slette det.</translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation>Vælg det ønskede diagram herunder, og klik på Tegn-knappen.</translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation>Klik her for at vælge diagram-typen.</translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation>Kontoens saldo</translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation>Udtrækninger efter kategori</translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation>Indsættelser efter kategori</translation>
     </message>
     <message>
         <source>Draw</source>
         <translation>Tegn</translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation>Klik her for at tegne det valgte diagram.</translation>
     </message>
     <message>
-        <source>Current balance: %1%2</source>
-        <translation type="obsolete">Nuværende saldo: %1%2</translation>
-    </message>
-    <message>
         <source>Enter password</source>
         <translation>Skriv kodeord</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Skriv venligst dit kodeord:</translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation>Bekræft kodeord</translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation>Bekræft dit kodeord:</translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation>Skriv dit kodeord for at bekræfte, at du vil slå kodeordsbeskyttelse fra:</translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation>Slet transaktion</translation>
     </message>
     <message>
         <source>Sort by:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select checkbook sorting here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entry Order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SortDate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Balance</source>
         <translation type="unfinished">Saldo</translation>
     </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation>Konfigurer Checkhæfte</translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation>Skriv valutasymbol:</translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation>Skriv symbolet for den lokale valuta her (fx. kr).</translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation>Vis om checkhæftet er beskyttet med
 kodeord</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
         <translation>Klik her for at vælge, om hovedvinduet skal vise, om checkhæftet er beskyttet med kodeord.</translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation>Vis checkhæfte-saldi</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation>Klik her for at vælge om hoved-vinduet skal vise den nuværende saldo for hver checkhæfte.</translation>
     </message>
     <message>
         <source>&amp;Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Account Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Account Types</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Payees</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open last checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether the last open checkbook will be opened at startup.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show last checkbook tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save new description as payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to save new descriptions in the list of payess.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ListEdit</name>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Slet</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation>Checkhæfte</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Ny</translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation>Klik her for at oprette et nyt checkhæfte.
 
 Du kan også vælge Nyt fra Checkhæfte-menuen.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Rediger</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation>Vælg et checkhæfte, og klik her for at redigere det.
 
 Du kan også vælge Rediger fra Checkhæfte-menuen, eller klikke og holde nede på et checkhæftes navn.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Slet</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation>Vælg et checkhæfte, og klik her for at slette det.
 
 Du kan også vælge Slet fra Checkhæfte-menuen.</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Konfigurer</translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation>Klik er for at konfigurere dette program.</translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation>Dette er en liste over tilgængelige checkhæfter.</translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation>Checkhæfte-navn</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>Saldo</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Skriv kodeord</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Skriv dit kodeord:</translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation>Slet checkhæfte</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>Date</source>
         <translation type="unfinished">Dato</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Rediger</translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished">Ny</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Slet</translation>
     </message>
     <message>
         <source>Savings</source>
         <translation type="unfinished">Opsparinger</translation>
     </message>
     <message>
         <source>Checking</source>
         <translation type="unfinished">Regninger</translation>
     </message>
     <message>
         <source>CD</source>
         <translation type="unfinished">CD</translation>
     </message>
     <message>
         <source>Money market</source>
         <translation type="unfinished">Pengemarkedet</translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation type="unfinished">Fælleskapital</translation>
     </message>
     <message>
         <source>Other</source>
         <translation type="unfinished">Andet</translation>
     </message>
     <message>
         <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation type="unfinished">Bil</translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="unfinished">Regninger</translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="unfinished">CD&apos;er</translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="unfinished">Tøj</translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="unfinished">Computer</translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="unfinished">DVD&apos;er</translation>
     </message>
     <message>
         <source>Electronics</source>
         <translation type="unfinished">Elektronik</translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation type="unfinished">Underholdning</translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="unfinished">Mad</translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="unfinished">Benzin</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished">Diverse</translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="unfinished">Film</translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="unfinished">Leje</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished">Rejser</translation>
     </message>
     <message>
         <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished">Arbejde</translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation type="unfinished">Familiemedlem</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation type="unfinished">Diverse kredit</translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation>Transaktion for</translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation>Udtrækning</translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation>Vælg om transaktionen er et udtræk eller en indsættelse.</translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation>Indsættelse</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Dato:</translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation>Vælg transaktionens dato her.</translation>
     </message>
     <message>
         <source>Number:</source>
         <translation>Nummber:</translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation>Skriv check-nummer her.</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Beskrivelse:</translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation>Skriv en beskrivelse af transaktionen her.</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategori:</translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation>Vælg en transaktions-kategori her.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Type:</translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation>Vælg transaktionstypen her.
 
 De tilgængelige valgmuligheder er ud fra om det er en indsætning eller en udtrækning.</translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation>Beløb:</translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation>Skriv beløbet her.
 
 Beløbet skal altid være positivt.</translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation>Gebyr:</translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation>Skriv eventuelt gebyr for transaktionen.
 
 Beløbet skal altid være positivt.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notater:</translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation>Skriv evt. ekstra informationer om transaktionen her.</translation>
     </message>
     <message>
-        <source>Automobile</source>
-        <translation 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
@@ -1,287 +1,206 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AlarmDlg</name>
     <message>
         <source>Clock</source>
         <translation type="unfinished">Ur</translation>
     </message>
     <message>
         <source>Snooze</source>
         <translation type="unfinished">Udsæt</translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AlarmDlgBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>TextLabel1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Snooze</source>
         <translation type="unfinished">Udsæt</translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thu</source>
         <comment>Thursday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fri</source>
         <comment>Friday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat</source>
         <comment>Saturday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sun</source>
         <comment>Sunday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lap/Split</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Daily Alarm:&lt;/b&gt;&lt;p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily alarm requires at least
 one day to be selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished">Alle</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished">Lyd</translation>
     </message>
 </context>
 <context>
     <name>ClockBase</name>
     <message>
         <source>Clock</source>
         <translation type="unfinished">Ur</translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stopwatch</source>
         <translation type="unfinished">Stopur</translation>
     </message>
     <message>
         <source>Split</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished">Start</translation>
     </message>
     <message>
         <source>Starts and stops the stopwatch.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lap/Split</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Resets the stopwatch.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check to enable the daily alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the hour the alarm will sound.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the minute the alarm will sound.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished">AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished">PM</translation>
     </message>
     <message>
         <source>Days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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
@@ -1,826 +1,830 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation>Kalender</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Ny</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>Idag</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dag</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Uge</translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation>Uge liste</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Måned</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Find</translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation>Begivenhedens varighed er
 potientielt længere end
 intervallet mellem gentagelserne.</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Kan ikke redigere data, synkronisering er igang</translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation>Rediger begivenhed</translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation> minutter)</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Ikke mere lagerplads</translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation>Kalender kunne ikke gemme
 dine ændringer.
 Frigør noget lagerplads og prøv igen.
 
 Afslut alligevel?</translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation>(Ukendt)</translation>
     </message>
     <message>
         <source>Error!</source>
         <translation>Fejl!</translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation>Ret</translation>
     </message>
     <message>
         <source>Continue</source>
         <translation>Fortsæt</translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation>Kopier begivenhed</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>Rediger...</translation>
     </message>
     <message>
         <source>error box</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation>M</translation>
     </message>
     <message>
         <source>T</source>
         <translation>T</translation>
     </message>
     <message>
         <source>W</source>
         <translation>O</translation>
     </message>
     <message>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
         <source>S</source>
         <translation>L</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Mandag</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Tirsdag</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Onsdag</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Torsdag</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Fredag</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Lørdag</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Søndag</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00p</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Denne begivenhed varer hele dagen.</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Start</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Slut</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Rediger</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Slet</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Send</translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished">Tid</translation>
     </message>
     <message>
         <source> - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Kopier</translation>
     </message>
     <message>
         <source>Beam this occurence</source>
         <translation>Send denne begivenhed</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation>:00 PM</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation>:00 AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Kalender</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>Indstillinger</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation>Start visning af begivenheder</translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation>Start tid:</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation>Alarm indstillinger</translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation>Alarm forvalg</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation> minutter</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Blandet</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>Række stil:</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Standard</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Medium</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Stor</translation>
     </message>
     <message>
         <source>Views</source>
         <translation>Visninger</translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation>Standard visning:</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dag</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Uge</translation>
     </message>
     <message>
         <source>Week List</source>
         <translation>Ugeliste</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Måned</translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation>Gå til dags dato</translation>
     </message>
     <message>
         <source>Time display</source>
         <translation>Klokketslet for</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ingen</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Start</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation>Start-slut</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Standardindstillinger</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Sted:</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Kontor</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Hjemme</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategori:</translation>
     </message>
+    <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>
         <translation>u</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Jan-00. Jan</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
         <translation type="unfinished">MTOTFLSM</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstEvent</name>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Rediger</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished">Kopier</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Slet</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished">Send</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>u</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>U: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation>p</translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Start Time</source>
         <translation>Start tid</translation>
     </message>
     <message>
         <source>End Time</source>
         <translation>Slut tid</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Kalender</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>Gentag...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>Dagligt...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>Ugentligt...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>Månedetligt...</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>Årligt...</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Ingen gentagelse...</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>Ny begivenhed</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Lokation</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategori</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Møde</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Frokost</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Middag</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Rejse</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Beskrivelse</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Kontor</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Hjemme</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>Start - Slut</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>Jan 02 00</translation>
     </message>
     <message>
         <source>Start time</source>
         <translation type="unfinished">Start tid</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Hele dagen</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Tidszone</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Alarm</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation> minutter</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Lydløs</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Høj</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Gentag</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Ingen gentagelse...</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Bemærkning...</translation>
     </message>
-    <message>
-        <source>Start Time</source>
-        <translation type="obsolete">Start tid</translation>
-    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Rediger bemærkning</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Frokost</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Start</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Slut</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Hver</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 hver </translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>D. %1 hver </translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>D. %1 %1 hver</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Hver</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Mandag</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Tirsdag</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Onsdag</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Torsdag</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Fredag</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Lørdag</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Søndag</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>.</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>.</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>.</translation>
     </message>
     <message>
         <source>th</source>
         <translation>.</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation>Ingen gentagelse</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>dag(e)</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>uge(r)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Gentag hver</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dag</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Dato</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>måned(er)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>år</translation>
     </message>
     <message>
         <source>days</source>
         <translation>dage</translation>
     </message>
     <message>
         <source>day</source>
         <translation>dag</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>uger</translation>
     </message>
     <message>
         <source>week</source>
         <translation>uge</translation>
     </message>
     <message>
         <source>month</source>
         <translation>måned</translation>
     </message>
     <message>
         <source>year</source>
         <translation>år</translation>
     </message>
     <message>
         <source> and </source>
         <translation> og </translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
 og </translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, og </translation>
     </message>
     <message>
         <source>on </source>
         <translation>på</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Gentagende begivenhed</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ingen</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dag</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Uge</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Måned</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>År</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Hver:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Hyppighed</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Slut den:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Ingen slut dato</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Gentagelse aktiveret</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Man</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Tir</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Ons</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Tor</translation>
     </message>
     <message>
         <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>Every</source>
         <translation>Hver</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>WeekVar</translation>
     </message>
     <message>
         <source>months</source>
         <translation>måneder</translation>
     </message>
     <message>
         <source>years</source>
         <translation>år</translation>
     </message>
 </context>
 </TS>
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
@@ -1,293 +1,249 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation>Kommando valg</translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation>Kommandoer</translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Kommandoer&lt;/B&gt;:</translation>
     </message>
     <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>
         <source>Cyan on White</source>
         <translation>Turkis på hvid</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>Hvid på turkis</translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation>Blå på sort</translation>
     </message>
     <message>
         <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>
         <source>Tab</source>
         <translation>Tab</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Op</translation>
     </message>
     <message>
         <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>
         <source>ScrollBar</source>
         <translation>Rullebjælke</translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation>Ombrydning</translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation>Brug bip</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>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>
         <source>Hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Pink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pink on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>new session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sessions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To exit fullscreen, tap here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History Lines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konsole </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Kommando valg</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation>Tilføj kommando</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation>Indtast kommando der skal tilføjes:</translation>
     </message>
 </context>
 </TS>
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
@@ -1,100 +1,96 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FifteenConfigDialog</name>
     <message>
         <source>All Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select board background</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FifteenConfigDialogBase</name>
     <message>
         <source>Configure Fifteen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use a Custom Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Path:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Preview:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Grid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Rows:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
 <context>
     <name>PiecesTable</name>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Femtenspillet</translation>
     </message>
     <message>
         <source>Congratulations!
 You win the game!</source>
         <translation>Tillykke!
 Du har vundet spillet!</translation>
     </message>
     <message>
         <source>R&amp;andomize Pieces</source>
         <translation>Bl&amp;and stykkerne</translation>
     </message>
     <message>
         <source>&amp;Reset Pieces</source>
         <translation>Nulstil stykke&amp;rne</translation>
     </message>
 </context>
 </TS>
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
@@ -1,68 +1,64 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KBill</name>
     <message>
         <source>kBill</source>
         <translation>kBill</translation>
     </message>
     <message>
         <source>New game</source>
         <translation>Nyt spil</translation>
     </message>
     <message>
         <source>Pause game</source>
         <translation>Pause</translation>
     </message>
     <message>
         <source>Story of kBill</source>
         <translation>Historien bag kBill</translation>
     </message>
     <message>
         <source>Rules</source>
         <translation>Regler</translation>
     </message>
     <message>
         <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>
         <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 disguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>UI</name>
     <message>
         <source>After Level</source>
         <translation>Efter bane</translation>
     </message>
     <message>
         <source>Your score</source>
         <translation>Point</translation>
     </message>
 </context>
 </TS>
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,110 +1,86 @@
 <!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>
         <source>Very Low</source>
         <translation>Meget lav</translation>
     </message>
     <message>
         <source>Critical</source>
         <translation>Kritisk</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Ukendt</translation>
     </message>
     <message>
         <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>
         <source>Remaining Power: %1%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remaining Time: %1m %2s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remaing Power: %1 %2
 Remaining Time: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ipaq  %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,23 +1,17 @@
 <!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>
 </TS>
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,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"></translation>
     </message>
     <message>
         <source>No translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
         <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"></translation>
     </message>
 </context>
 </TS>
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,1090 +1,727 @@
 <!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>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished">Uge</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished">Måned</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished">År</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished">Hver:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished">Hyppighed</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished">Afslut den:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">Gentagelse aktiv</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">Man</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">Tir</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">Ons</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">Tor</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">Fre</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">Lør</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">Søn</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">Hver</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished">dage</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished">dag</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished">uger</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished">uge</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished">måneder</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished">månede</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished">år</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished">år</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished">og</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished">,
 og</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished">, og</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished">på</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished">Ingen gentagelse</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished">dag(e)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">Gentagelse aktiv</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">Man</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">Tir</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">Ons</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">Tor</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">Fre</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">Lør</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">Søn</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished">uge(r)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished">Gentag efter</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">Dag</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Dato</translation>
     </message>
     <message>
         <source>month(s)</source>
         <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>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to edit the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to duplicate the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to delete the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to transmit the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</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>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>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Deadline:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategori:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation>Standard email:</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Kontor:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Arbejde hjemmeside:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Arbejde tlf:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Arbejde fax:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Arbejde mobil-tlf:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Forretning pager:</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Privat hjemmeside:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Privat telefon:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Privat fax:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Privat mobil-tlf:</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation>Alle email-adresser:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Stilling:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Assistent:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Leder:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Mand</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Kvinde</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Køn:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Ægtefælle:</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Fødselsdag:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Bryllupsdag:</translation>
     </message>
     <message>
         <source>Children: </source>
         <translation>Børn:</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notater:</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation>Start:</translation>
     </message>
     <message>
         <source>End:</source>
         <translation>Slut:</translation>
     </message>
     <message>
         <source>Note:</source>
         <translation>Notat:</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Hver</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 hver </translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>Den %1 hver</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Hver</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Mandag</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Tirsdag</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Onsdag</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Torsdag</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Fredag</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Lørdag</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Søndag</translation>
     </message>
     <message>
-        <source>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>
         <source>Low</source>
         <translation>Lav</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation>Meget lav</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Placering:</translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation>Hele dagen</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation>Flere dage</translation>
     </message>
     <message>
-        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
-        <translation 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>
         <source>User Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profession</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Has a due-date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No due-date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No reccurrence</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No start-date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No completed-date</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>.</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>.</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>.</translation>
     </message>
     <message>
         <source>th</source>
         <translation>.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/libopieui2.ts b/i18n/da/libopieui2.ts
index 3057343..9a4f3c6 100644
--- a/i18n/da/libopieui2.ts
+++ b/i18n/da/libopieui2.ts
@@ -1,745 +1,175 @@
 <!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>
     </message>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished">Navn</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished">Størelse</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Dato</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>Open</source>
         <translation type="unfinished">Åbn</translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished">Gem</translation>
     </message>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished">Navn:</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation type="unfinished">Stil</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished">Størrelse</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished">The Quick Brown Fox Jumps Over Lazy Dog</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="unfinished">Navn</translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished"></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="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
@@ -1,1028 +1,994 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Ikke-arkiverede</translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation>(flere)</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Erhverv</translation>
     </message>
     <message>
         <source>Personal</source>
         <translation>Personlig</translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation>(Flere)</translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>Ny Kategori</translation>
     </message>
     <message>
         <source>New Category </source>
         <translation>Ny Kategori</translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation>Kategori Redigering</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>Kategorier</translation>
     </message>
     <message>
         <source>Application</source>
         <translation>Program</translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation>Kategorier placeres her</translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation>Vælg kategorierne som dette dokument tilhører.</translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation>Indtast en ny kategori her. Tryk &lt;b&gt;Tilføj&lt;/b&gt; for at tilføje den til listen.</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Tilføj</translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation>Indtast en ny kategori til venstre og tryk for at tilføje den til listen.</translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation>Tryk for at slette den valgte kategori.</translation>
     </message>
     <message>
         <source>Global</source>
         <translation>Global</translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation>Tjek afkrydsningsfeltet for at gøre denne egenskab tilgængelig for alle programmer.</translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Ikke-arkiverede</translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation>Fejl</translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation>Desværre! Et andet
 program er igang med at
 redigere kategorierne.</translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation>Redigér Kategorier</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation>Vis januar i det valgte år</translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation>Vis foregående måned</translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation>Vis næste måned</translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation>Vis december i det valgte år</translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation>Luk Filvælgeren</translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation>Vis dokumenter af denne type</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Dokument visning</translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation>Vis dokumenter i denne kategori</translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation>Klik for at vælge et dokument fra listen</translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation>, eller vælg &lt;b&gt;Nyt Dokument&lt;/b&gt; for at lave et nyt dokument.</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation>&lt;br&gt;&lt;br&gt;Klik og hold for at se dokumentets egenskaber.</translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation>Navn</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <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>
         <source>Find what:</source>
         <translation>Find hvad:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategori:</translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation>Start søgning ved:</translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation>Dec 02 01</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Versalfølsom</translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation>Søg baglæns</translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Properties</source>
         <translation>Egenskaber</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Dokument visning</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Slet</translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation>Fejl under sletning af filen.</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Harddisk</translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation>Kopi af</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Dupliker</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>Fejl under kopiering af filen.</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Detaljer</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>Fejl under flytning af filen.</translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation>Detaljer</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation>Brug brugerdefineret rotation</translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation>Indlæs programmet på forhånd så det er klar til brug.</translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation>Navnet på dette dokument.</translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation>Mediet som dokumentet ligger på.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Type:</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Lokation:</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Navn:</translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation>Hurtig indlæsning (bruger hukommelse)</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>Kommentar:</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Slet</translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation>Slet dette dokument.</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Kopiér</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation>Lav en kopi af dette dokument.</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Send</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation>Send dette dokument til en anden enhed.</translation>
     </message>
     <message>
         <source>Arguments:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>Ejer information</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>1</source>
         <translation></translation>
     </message>
     <message>
         <source>2</source>
         <translation></translation>
     </message>
     <message>
         <source>3</source>
         <translation></translation>
     </message>
     <message>
         <source>4</source>
         <translation></translation>
     </message>
     <message>
         <source>5</source>
         <translation></translation>
     </message>
     <message>
         <source>6</source>
         <translation></translation>
     </message>
     <message>
         <source>7</source>
         <translation></translation>
     </message>
     <message>
         <source>8</source>
         <translation></translation>
     </message>
     <message>
         <source>9</source>
         <translation></translation>
     </message>
     <message>
         <source>0</source>
         <translation></translation>
     </message>
     <message>
         <source>OK</source>
         <translation></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Indtast kode</translation>
     </message>
 </context>
 <context>
     <name>QMessageBox</name>
     <message>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nej</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>New Document</source>
         <translation>Nyt Dokument</translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation>Ikke mere lagerplads</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>Der opstod at problem under
 oprettelsen af konfigurations
 informationen til dette program.
 
 Frigør noget lagerplads og
 prøv igen.</translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation>Kunne ikke oprette opstarts
 filer. Frigør noget lagerplads
 før du indtaster data</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation>Kunne ikke sætte alarmen.
 Frigør noget hukommelse og prøv igen.</translation>
     </message>
     <message>
         <source>Y</source>
         <translation></translation>
     </message>
     <message>
         <source>day</source>
         <translation>dag</translation>
     </message>
     <message>
         <source>month</source>
         <translation>måned</translation>
     </message>
     <message>
         <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>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Hjemme adresse:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation>Email adresser: </translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Hjemme telefon: </translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Hjemme fax:  </translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Hjemme mobil: </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Hjemme webside: </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Arbejds webside: </translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Kontor: </translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Arbejds telefon: </translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Arbejds fax: </translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Arbejds mobil: </translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Arbejds personsøger: </translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Erhverv: </translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Assistent: </translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Chef: </translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Mand</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Kvinde</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Køn: </translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Ægtefælle: </translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Fødselsdag: </translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Årsdag: </translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Øgenavn: </translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Navne titel</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Fornavn</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Mellemnavn</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Efternavn</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Suffiks</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Gem som</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Job titel</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Afdeling</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Firma</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Arbejds telefon</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Arbejds fax</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Arbejds mobil</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>Standard email</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>Emails</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Hjemme telefon</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Hjemme fax</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Hjemme mobil</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Arbejds gade</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Arbejds by</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>Arbejds stat</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>Arbejds postnr.</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>Arbejds land</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Arbejds personsøger</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Arbejds webside</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Kontor</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Erhverv</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Assistent</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Chef</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Hjemme gade</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Hjemme by</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>Hjemme stat</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>Hjemme postnr.</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>Hjemme land</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Hjemme webside</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Ægtefælle</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Køn</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Fødselsdag</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Årsdag</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Øgenavn</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Børn</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Noter</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Grupper</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Man</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Tir</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Ons</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Tor</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
         <source>May</source>
         <translation>Maj</translation>
     </message>
     <message>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
         <source>Aug</source>
         <translation>Aug</translation>
     </message>
     <message>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
         <source>Oct</source>
         <translation>Okt</translation>
     </message>
     <message>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
         <source>Dec</source>
         <translation>Dec</translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation type="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>
     <message>
         <source>%1 document</source>
         <translation>%1 dokument</translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation type="unfinished">Klik for at lukke dette vindue uden at gemme ændringer.</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation type="unfinished">Klik for at lukke dette vindue.</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation type="unfinished">Klik for at lukke dette vindue og anvende ændringer.</translation>
     </message>
     <message>
         <source>Click to make this window movable.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
         <translation type="unfinished">Klik for at få dette vindue til at bruge hele skærmen.</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maximize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>CF Kort</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Harddisk</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>SD Kort</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>MMC Kort</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>SCSI Harddisk</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>Intern Hukommelse</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Internt Lager</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>Ingen</translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation>&apos;citytime&apos; programmet blev ikke fundet</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation>For at vælge tidszoner,
 skal du installere &apos;citytime&apos;.</translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Ikke mere lagerplads</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Kunne ikke planlægge alarmen.
 Frigør noget lagerplads og prøv igen</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>%1 filer</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>%1 %2</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>Alle %1 filer</translation>
     </message>
     <message>
         <source>All files</source>
         <translation>Alle filer</translation>
     </message>
 </context>
 <context>
     <name>WindowDecoration</name>
     <message>
         <source>Default</source>
         <comment>List box text for default window decoration</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,59 +1,40 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>Todolist plugin</source>
         <translation>Opgaveliste plugin</translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation>Der er &lt;b&gt; 1&lt;/b&gt; aktiv opgave:  &lt;br&gt;</translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation>Der er &lt;b&gt; %1&lt;/b&gt; aktive opgaver: &lt;br&gt;</translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation>Ingen aktive opgaver</translation>
     </message>
 </context>
 <context>
     <name>TodoPluginConfigBase</name>
     <message>
         <source>Set the maximum number of task that should be shown</source>
         <translation>Indstil maksimum antal opgaver der skal vises</translation>
     </message>
     <message>
         <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,37 +1,33 @@
 <!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>
         <source>Game</source>
         <translation>Spil</translation>
     </message>
     <message>
         <source>Mine Sweep</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,300 +1,328 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BaseSetup</name>
     <message>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slideshow timeout:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Toggle autoscale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to next image</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Delete Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Image Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></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>Browser Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Keyboard Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie Eye - Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Imageinfo Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Imageview Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Go dir up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start slideshow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and Imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show images fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto rotate images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show images unscaled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show zoomer window when unscaled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
     <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>
         <source>&lt;center&gt;&lt;b&gt;Be carefull with the following options!&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show files recursive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recursion depth:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Digital Camera View</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Name Only</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>imageinfo</name>
     <message>
         <source>View Full Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays an thumbnail of the image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays info of selected image</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,127 +1,123 @@
 <!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>
         <source>User</source>
         <translation>Bruger</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Kodeord</translation>
     </message>
     <message>
         <source>Suspend</source>
         <translation>Stands</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Menu</translation>
     </message>
 </context>
 <context>
     <name>LoginWindowImpl</name>
     <message>
         <source>Restart</source>
         <translation>Genstart</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>Afslut</translation>
     </message>
     <message>
         <source>Wrong password</source>
         <translation>Forkert kodeord</translation>
     </message>
     <message>
         <source>The given password is incorrect.</source>
         <translation>Kodeordet er forkert.</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Fejl</translation>
     </message>
     <message>
         <source>Could not switch to new user identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie was terminated
 by an uncaught signal
 (%1)
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not start Opie.</source>
         <translation>Kunne ikke starte Opie.</translation>
     </message>
 </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>
     <message>
         <source>&lt;b&gt;Password:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Confirm:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PasswordDialogImpl</name>
     <message>
         <source>Trying to leave without password set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;No password was set. This could lead to you not beeingable to remotely connect to your machine.Do you want to continue not setting a password?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passwords don&apos;t match</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The two passwords don&apos;t match. Please try again.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password not legal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The entered password is not a valid password.Please try entering a valid password.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,817 +1,878 @@
 <!DOCTYPE TS><TS>
 <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>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerUI</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposeMail</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please create an SMTP account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a File.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Store message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Store message into drafts?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Attachments will not be stored in &quot;Draft&quot; folder&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Receiver specified</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposeMailUI</name>
     <message>
         <source>Compose Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>send later</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>use:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BCC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <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>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>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete the selected Account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select an account.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccountsUI</name>
     <message>
         <source>Configure Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>News</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IMAPconfigUI</name>
     <message>
         <source>Configure IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefix</source>
         <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>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>
     </message>
     <message>
         <source>Send queued mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show/Hide folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Newsgroups</source>
         <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>
     </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>
 <context>
     <name>NNTPconfigUI</name>
     <message>
         <source>Configure NNTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Newsgroup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get newsgroup list from server</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Newmdirdlgui</name>
     <message>
         <source>Enter directory name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directory name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directory contains other subdirs</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <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>
     </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>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></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>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec imapd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>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>
     </message>
     <message>
         <source>Use Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the SMTP Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port of the SMTP Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SelectMailTypeUI</name>
     <message>
         <source>Select Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Account Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>POP3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SMTP</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SettingsDialogUI</name>
     <message>
         <source>Settings Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View mail as Html</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compose Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mails later ( enqueue in outbox )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></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>
     </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>
     </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>
     </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>
     </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>
     </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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Store mail(s) to&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Folder:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create new folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefix will prepend, no need to enter it!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move mail(s)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,151 +1,131 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <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>
         <source>Options</source>
         <translation>Valg</translation>
     </message>
     <message>
         <source>Enter your search terms here</source>
         <translation>Skriv dine søgeord her</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Programmer</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Dokumenter</translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation>Opgaveliste</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Kalender</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Kontakter</translation>
     </message>
     <message>
         <source>Search for: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case sensitive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OListView</name>
     <message>
         <source>Results</source>
         <translation>Resultater</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>show</source>
         <translation>vis</translation>
     </message>
     <message>
         <source>edit</source>
         <translation>rediger</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>kør</translation>
     </message>
     <message>
         <source>open in filemanager</source>
         <translation>åbn i filhåndtering</translation>
     </message>
     <message>
         <source>open with </source>
         <translation>åbn med</translation>
     </message>
     <message>
-        <source>show completed tasks</source>
-        <translation 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>
         <source>Search in dates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search content</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,463 +1,451 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CalcDlg</name>
     <message>
         <source>Molecular Weight</source>
         <translation>Molar Masse</translation>
     </message>
     <message>
         <source>Chemical Formula</source>
         <translation>Kemisk Formel</translation>
     </message>
     <message>
         <source>Calculate</source>
         <translation>Beregn</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>Slet</translation>
     </message>
     <message>
         <source>Molecular Weight (u):</source>
         <translation>Molar Masse (u):</translation>
     </message>
     <message>
         <source>Elemental Composition (%):</source>
         <translation>Grundstoffernes Komposition (%):</translation>
     </message>
     <message>
         <source>CalcDlg</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OxydataWidget</name>
     <message>
         <source>%1 u</source>
         <translation></translation>
     </message>
     <message>
         <source>%1 J</source>
         <translation></translation>
     </message>
     <message>
         <source>%1 K</source>
         <translation></translation>
     </message>
     <message>
         <source>Block</source>
         <translation>Blok</translation>
     </message>
     <message>
         <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>
         <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>
 <context>
     <name>Oxygen</name>
     <message>
         <source>Oxygen</source>
         <translation>Oxygen</translation>
     </message>
     <message>
         <source>PSE</source>
         <translation>GPS</translation>
     </message>
     <message>
         <source>Data</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation>Udregninger</translation>
     </message>
     <message>
         <source>Hydrogen</source>
         <translation>Hydrogen</translation>
     </message>
     <message>
         <source>Helium</source>
         <translation>Helium</translation>
     </message>
     <message>
         <source>Lithium</source>
         <translation>Lithium</translation>
     </message>
     <message>
         <source>Beryllium</source>
         <translation>Beryllium</translation>
     </message>
     <message>
         <source>Boron</source>
         <translation>Bor</translation>
     </message>
     <message>
         <source>Carbon</source>
         <translation>Kulstof</translation>
     </message>
     <message>
         <source>Nitrogen</source>
         <translation>Nitrogen</translation>
     </message>
     <message>
         <source>Fluorine</source>
         <translation>Fluor</translation>
     </message>
     <message>
         <source>Neon</source>
         <translation>Neon</translation>
     </message>
     <message>
         <source>Sodium</source>
         <translation>Natrium</translation>
     </message>
     <message>
         <source>Magnesium</source>
         <translation>Magnesium</translation>
     </message>
     <message>
         <source>Aluminum</source>
         <translation>Aluminium</translation>
     </message>
     <message>
         <source>Silicon</source>
         <translation>Silicium</translation>
     </message>
     <message>
         <source>Phosphorus</source>
         <translation>Phosphor</translation>
     </message>
     <message>
         <source>Sulfur</source>
         <translation>Svovl</translation>
     </message>
     <message>
         <source>Chlorine</source>
         <translation>Chlor</translation>
     </message>
     <message>
         <source>Argon</source>
         <translation>Argon</translation>
     </message>
     <message>
         <source>Potassium</source>
         <translation>Kalium</translation>
     </message>
     <message>
         <source>Calcium</source>
         <translation>Calcium</translation>
     </message>
     <message>
         <source>Scandium</source>
         <translation>Scandium</translation>
     </message>
     <message>
         <source>Titanium</source>
         <translation>Titan</translation>
     </message>
     <message>
         <source>Vanadium</source>
         <translation>Vanadium</translation>
     </message>
     <message>
         <source>Chromium</source>
         <translation>Chrom</translation>
     </message>
     <message>
         <source>Manganese</source>
         <translation>Mangan</translation>
     </message>
     <message>
         <source>Iron</source>
         <translation>Jern</translation>
     </message>
     <message>
         <source>Cobalt</source>
         <translation>Cobalt</translation>
     </message>
     <message>
         <source>Nickel</source>
         <translation>Nikkel</translation>
     </message>
     <message>
         <source>Copper</source>
         <translation>Kobber</translation>
     </message>
     <message>
         <source>Zinc</source>
         <translation>Zink</translation>
     </message>
     <message>
         <source>Gallium</source>
         <translation>Galium</translation>
     </message>
     <message>
         <source>Germanium</source>
         <translation>Germanium</translation>
     </message>
     <message>
         <source>Arsenic</source>
         <translation>Arsen</translation>
     </message>
     <message>
         <source>Selenium</source>
         <translation>Selen</translation>
     </message>
     <message>
         <source>Bromine</source>
         <translation>Brom</translation>
     </message>
     <message>
         <source>Krypton</source>
         <translation>Krypton</translation>
     </message>
     <message>
         <source>Rubidium</source>
         <translation>Rubidium</translation>
     </message>
     <message>
         <source>Strontium</source>
         <translation>Strontium</translation>
     </message>
     <message>
         <source>Yttrium</source>
         <translation>Yttrium</translation>
     </message>
     <message>
         <source>Zirconium</source>
         <translation>Zirkonium</translation>
     </message>
     <message>
         <source>Niobium</source>
         <translation>Niobium</translation>
     </message>
     <message>
         <source>Molybdenum</source>
         <translation>Molybdæn</translation>
     </message>
     <message>
         <source>Technetium</source>
         <translation>Technetium</translation>
     </message>
     <message>
         <source>Ruthenium</source>
         <translation>Ruthenium</translation>
     </message>
     <message>
         <source>Rhodium</source>
         <translation>Rhodium</translation>
     </message>
     <message>
         <source>Palladium</source>
         <translation>Palladium</translation>
     </message>
     <message>
         <source>Silver</source>
         <translation>Sølv</translation>
     </message>
     <message>
         <source>Cadmium</source>
         <translation>Cadmium</translation>
     </message>
     <message>
         <source>Indium</source>
         <translation>Indium</translation>
     </message>
     <message>
         <source>Tin</source>
         <translation>Tin</translation>
     </message>
     <message>
         <source>Antimony</source>
         <translation>Antimon</translation>
     </message>
     <message>
         <source>Tellurium</source>
         <translation>Tellur</translation>
     </message>
     <message>
         <source>Iodine</source>
         <translation>Jod</translation>
     </message>
     <message>
         <source>Xenon</source>
         <translation>Xenon</translation>
     </message>
     <message>
         <source>Cesium</source>
         <translation>Cæsium</translation>
     </message>
     <message>
         <source>Barium</source>
         <translation>Barium</translation>
     </message>
     <message>
         <source>Lanthanum</source>
         <translation>Lanthan</translation>
     </message>
     <message>
         <source>Cerium</source>
         <translation>Cerium</translation>
     </message>
     <message>
         <source>Praseodymium</source>
         <translation>Praseodym</translation>
     </message>
     <message>
         <source>Neodymium</source>
         <translation>Neodym</translation>
     </message>
     <message>
         <source>Promethium</source>
         <translation>Promethium</translation>
     </message>
     <message>
         <source>Samarium</source>
         <translation>Samarium</translation>
     </message>
     <message>
         <source>Europium</source>
         <translation>Europium</translation>
     </message>
     <message>
         <source>Gadolinium</source>
         <translation>Gadolinium</translation>
     </message>
     <message>
         <source>Terbium</source>
         <translation>Terbium</translation>
     </message>
     <message>
         <source>Dysprosium</source>
         <translation>Dysprosium</translation>
     </message>
     <message>
         <source>Holmium</source>
         <translation>Holmium</translation>
     </message>
     <message>
         <source>Erbium</source>
         <translation>Erbium</translation>
     </message>
     <message>
         <source>Thulium</source>
         <translation>Thulium</translation>
     </message>
     <message>
         <source>Ytterbium</source>
         <translation>Ytterbium</translation>
     </message>
     <message>
         <source>Lutetium</source>
         <translation>Lutetium</translation>
     </message>
     <message>
         <source>Hafnium</source>
         <translation>Hafnium</translation>
     </message>
     <message>
         <source>Tantalum</source>
         <translation>Tantal</translation>
     </message>
     <message>
         <source>Tungsten</source>
         <translation>Wolfram</translation>
     </message>
     <message>
         <source>Rhenium</source>
         <translation>Rhenium</translation>
     </message>
     <message>
         <source>Osmium</source>
         <translation>Osmium</translation>
     </message>
     <message>
         <source>Iridium</source>
         <translation>Iridium</translation>
     </message>
     <message>
         <source>Platinum</source>
         <translation>Platin</translation>
     </message>
     <message>
         <source>Gold</source>
         <translation>Guld</translation>
     </message>
     <message>
         <source>Mercury</source>
         <translation>Kviksølv</translation>
     </message>
     <message>
         <source>Thallium</source>
         <translation>Thallium</translation>
     </message>
     <message>
         <source>Lead</source>
         <translation>Bly</translation>
     </message>
     <message>
         <source>Bismuth</source>
         <translation>Bismuth</translation>
     </message>
     <message>
         <source>Polonium</source>
         <translation>Polonium</translation>
     </message>
     <message>
         <source>Astatine</source>
         <translation>Astatin</translation>
     </message>
     <message>
         <source>Radon</source>
         <translation>Radon</translation>
     </message>
     <message>
         <source>Francium</source>
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
@@ -1,97 +1,73 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CanvasCardWindow</name>
     <message>
         <source>Patience</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Freecell</source>
         <translation type="unfinished"></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>
         <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>
         <source>Snap to position</source>
         <translation>Grib kort</translation>
     </message>
     <message>
         <source>Turn one card</source>
         <translation>Vend ét kort</translation>
     </message>
     <message>
         <source>Turn three cards</source>
         <translation>Vend tre kort</translation>
     </message>
 </context>
 </TS>
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
@@ -1,594 +1,415 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished">Program Problem</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;%1 svarer ikke.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Ønsker du at tvinge programmet til at afslutte?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <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>
 <context>
     <name>FirstUse</name>
     <message>
         <source>&lt;&lt; Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next &gt;&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap anywhere on the screen to continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait, loading %1 settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finish</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputMethods</name>
     <message>
         <source>Unicode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation type="unfinished">Starter</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished"> - Starter</translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished">Intet program</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished">&lt;p&gt;Der er ikke defineret noget program til dette dokument.&lt;p&gt;Typen er %1.</translation>
     </message>
     <message>
-        <source>Finding documents</source>
-        <translation type="obsolete">Finder dokumenter</translation>
-    </message>
-    <message>
-        <source>Searching documents</source>
-        <translation type="obsolete">Søger dokumenter</translation>
-    </message>
-    <message>
         <source>Documents</source>
         <translation type="unfinished">Dokumenter</translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>Icon View</source>
         <translation type="unfinished">Ikoner</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished">Liste</translation>
     </message>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
-        <source>%1 files</source>
-        <translation type="obsolete">%1 filer</translation>
-    </message>
-    <message>
-        <source>All types of file</source>
-        <translation type="obsolete">Alle typer filer</translation>
-    </message>
-    <message>
         <source>Document View</source>
         <translation type="unfinished">Dokument visning</translation>
     </message>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>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>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished">Alle</translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished">Billede</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished">Tekst</translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished">Video</translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished">Tilføj</translation>
     </message>
     <message>
         <source>Remove</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">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>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Server</name>
     <message>
         <source>USB Lock</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation type="unfinished">Information</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Systemets dato ser ikke ud til at være korrekt.
 (%1)&lt;/p&gt;&lt;p&gt;Ønsker du at indstille uret?&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>Battery level is critical!
-Keep power off until power restored!</source>
-        <translation type="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>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Critical Memory Shortage
 Please end this application
 immediately.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WARNING</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The battery is running very low. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The Back-up battery is very low&lt;p&gt;Please charge the back-up battery</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation type="unfinished">Luk ned</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation type="unfinished">Luk Opie</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation type="unfinished">Genstart</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation type="unfinished">Genstart Opie</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation type="unfinished">Luk ned</translation>
     </message>
     <message>
-        <source>&lt;p&gt;
-These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
-        <translation type="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
@@ -1,332 +1,244 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoginBase</name>
     <message>
         <source>LoginBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you select this option, opie-login will automagically log you in with the user you have selected in the drop-down list.  
 
 For the Zaurus 5x00 this is always the user &quot;root&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This drop-down list allows you to select the user for auto-login
 (if enabled above).  
 
 You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MultiauthConfig</name>
     <message>
         <source>Security configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the order they will appear in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished">Synkronisering</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished">Vilkårlig</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Ingen</translation>
     </message>
     <message>
         <source>Important notice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Locking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></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-securityplugin-*&lt;/em&gt; package! Once you have done that, you will be able to configure your PDA protection here.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MultiauthGeneralConfig</name>
     <message>
         <source>When to lock Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on Opie start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on Opie resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Multiple plugins authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Required successes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Don&apos;t protect this config screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show explanatory screens</source>
         <translation type="unfinished"></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>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You must save your current settings before trying to authenticate. Press OK to accept and launch a simulated authentication process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you don&apos;t like the result of this test, don&apos;t forget to change your settings before you exit the configuration application!</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>
     </message>
     <message>
         <source>Select a net-range or enter a new one.  
 
 This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
 
 For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
 
 The entry &quot;All&quot; will allow *any* IP to connect. 
 The entry &quot;None&quot; will *deny* any connection.  
 
 If unsure, select &quot;Any&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the selected net range from the list
 
 If you press this button, the currently selected net range will be deleted from the list of net ranges.
 
 If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
 the list to the state it has been when you initially booted your Zaurus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button will restore the list of net ranges
 to the defaults.
 
 Beware that all manually entered net ranges will be lost!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select your sync software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Qtopia 1.7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie 1.0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IntelliSync</source>
         <translation type="unfinished"></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="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,51 +1,43 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>SnakeGame</name>
     <message>
         <source>Snake</source>
         <translation>Snake</translation>
     </message>
     <message>
         <source>New Game</source>
         <translation>Nyt spil</translation>
     </message>
     <message>
         <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
@@ -1,397 +1,357 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tests</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSysInfo</name>
     <message>
         <source>CF</source>
         <translation type="unfinished">CF</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation type="unfinished">Denne graf repræsenterer hvor meget hukommelse der iøjeblikket er i brug på dette Compact Flash hukommelses kort.</translation>
     </message>
     <message>
         <source>Ha</source>
         <translation type="unfinished">Ha</translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation type="unfinished">Denne graf repræsenterer hvor meget lager der iøjeblikket er i brug på denne harddisk.</translation>
     </message>
     <message>
         <source>SD</source>
         <translation type="unfinished">SD</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation type="unfinished">Denne graf repræsenterer hvor meget hukommelse der iøjeblikket er i brug på dette Secure Digital hukommelses kort.</translation>
     </message>
     <message>
         <source>SC</source>
         <translation type="unfinished">SC</translation>
     </message>
     <message>
         <source>In</source>
         <translation type="unfinished">In</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation type="unfinished">Denne graf repræsenterer hvor meget hukommelse der iøjeblikket er i brug af den indbyggede hukommelse (f.eks. Flash hukommelsen) på denne håndholdte enhed.</translation>
     </message>
     <message>
         <source>RA</source>
         <translation type="unfinished">RA</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation type="unfinished">Denne graf repræsenterer hvor meget hukommelse der iøjeblikket er i brug af den midlertidige RAM disk.</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Program CPU forbrug (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>System CPU forbrug (%)</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Denne side viser hvor meget af denne enheds processor er i brug.</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Type: </translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
-        <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
-Memory is categorized as follows:
-
-1. Used - memory used to by Opie and any running applications.
-2. Buffers - temporary storage used to improve performance
-3. Cached - information that has recently been used, but has not been freed yet.
-4. Free - memory not currently used by Opie or any running applications.</source>
-        <translation type="obsolete">Denne side viser hvor meget hukommelse (f.eks. RAM) der bliver allokeret på din håndholdte enhed.
-Hukommelse er kategoriseret som følgende:
-
-1. Brugt - hukommelse brugt af Opie og alle igangværende programmer.
-2. Buffer - midlertidigt lager brugt til at øge ydelsen.
-3. Cache - information der fornyelig har været brugt men ikke er blevet frigjort endnu.
-4. Fri - hukommelsen der iøjeblikket ikke er i brug af Opie eller andre igangværende programmer.</translation>
-    </message>
-    <message>
         <source>Used (%1 kB)</source>
         <translation>Brugt (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Buffere (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Cache (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Fri (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Hukommelse ialt: %1 kB</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Modul</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Størrelse</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Brug#</translation>
     </message>
     <message>
-        <source>Used By</source>
-        <translation type="obsolete">Brugt af</translation>
-    </message>
-    <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>Dette er en liste af alle de kernel moduler der iøjeblikket er indlæst på denne håndholdte enhed.
 
 Klik og hold på et modul for at se yderligere information om modulet eller for at fjerne det.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Vælg en kommando her og klik på Send knappen til højre for at sende kommandoen til det valgte modul oven over.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Send</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Klik her for at sende den valgte kommando til det valgte modul oven over.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Dette område viser detaljeret information om dette modul.</translation>
     </message>
     <message>
-        <source>You really want to execute
-</source>
-        <translation type="obsolete">Vil du virkelig køre
-</translation>
-    </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>
         <source> : %1 kB</source>
         <translation> : %1 kB</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Brugt (%1 kB)</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>Fri (%1 kB)</translation>
     </message>
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Kommando</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Tid</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation>Dette er en liste over alle processer på denne håndholdte enhed.
 
 Klik og hold på en proces for at se yderligere information om processen eller for at sende et signal til den.</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation>Vælg et signal her og klik på Send-knappen til højre for at sende til denne proces.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Send</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation>Klik her for at sende det valgte signal til denne proces.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>Dette område viser detaljeret information omkring denne proces.</translation>
     </message>
     <message>
-        <source>You really want to send
-</source>
-        <translation type="obsolete">Vil du sende
-</translation>
-    </message>
-    <message>
         <source>Really want to send %1
 to this process?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>System Info</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Hukommelse</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Lager</translation>
     </message>
     <message>
         <source>CPU</source>
         <translation>CPU</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Proces</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>Moduler</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Version</translation>
     </message>
     <message>
         <source>Benchmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syslog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Linux Kerne&lt;/b&gt;&lt;p&gt;Version: </translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Kompileret af: </translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Bygget den: </translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>&lt;p&gt;Version: </translation>
     </message>
     <message>
-        <source>&lt;p&gt;Model: </source>
-        <translation 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>
         <source>Built against Qt/E </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,69 +1,58 @@
 <!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>
     <message>
         <source>TableViewer - Edit Keys</source>
         <translation>Tabel viser - Redigér nøgler</translation>
     </message>
     <message>
         <source>Key Name</source>
         <translation>Nøgle navn</translation>
     </message>
     <message>
         <source>Key Type</source>
         <translation>Nøgle type</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Ny</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Slet</translation>
     </message>
     <message>
         <source>Clear All</source>
         <translation>Slet alt</translation>
     </message>
 </context>
 <context>
     <name>TVListView</name>
     <message>
         <source>List View</source>
         <translation>Liste visning</translation>
     </message>
 </context>
 <context>
     <name>TableViewerWindow</name>
     <message>
         <source>Table Viewer</source>
         <translation>Tabel viser</translation>
     </message>
     <message>
         <source>could not load Document</source>
         <translation>Kunne ikke hente dokumentet</translation>
     </message>
 </context>
 </TS>
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,48 +1,41 @@
 <!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>
     </message>
     <message>
         <source>Quit</source>
         <translation>Afslut</translation>
     </message>
     <message>
         <source>Click Play to start</source>
         <translation>Klik &apos;Spil&apos; for at starte</translation>
     </message>
     <message>
         <source>Make your move</source>
         <translation>Dit træk</translation>
     </message>
     <message>
         <source>You won!</source>
         <translation>Du vandt!</translation>
     </message>
     <message>
         <source>Computer won!</source>
         <translation>Computeren vandt!</translation>
     </message>
     <message>
         <source>It&apos;s a draw</source>
         <translation>Uafgjort</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/today.ts b/i18n/da/today.ts
index c25f037..d908ab9 100644
--- a/i18n/da/today.ts
+++ b/i18n/da/today.ts
@@ -1,198 +1,142 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation type="unfinished">Idag</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation>Ejes af </translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Udfyld venligst visitkortet</translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation>Klik her for at starte det tilknyttede program</translation>
     </message>
     <message>
-        <source>No plugins found</source>
-        <translation 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>
         <translation>Idag</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
         <translation>Idag af Maximilian Reiß</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>Klik her for at gå til indstillingerne</translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>Hent hvilke plugins i hvilken rækkefølge:</translation>
     </message>
     <message>
         <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>
         <source>autostart on resume?</source>
         <translation>autostart ved opvågning?</translation>
     </message>
     <message>
         <source>tiny banner</source>
         <translation>minibanner</translation>
     </message>
     <message>
         <source>Have small banner </source>
         <translation>Minibanner</translation>
     </message>
     <message>
         <source> min</source>
         <translation>min</translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
         <translation>Hvor mange minutter PDA&apos;en har været i dvale før autostart egenskaben er aktiv ved opvågning</translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation>Minutter inaktiv</translation>
     </message>
     <message>
         <source> pixel</source>
         <translation>pixels</translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
         <translation>Indstil størrelsen på ikonet i pixels</translation>
     </message>
     <message>
         <source>icon size</source>
         <translation>Ikonstørrelse</translation>
     </message>
     <message>
         <source> sec</source>
         <translation> sek</translation>
     </message>
     <message>
         <source>never</source>
         <translation>aldrig</translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
         <translation>Hvor ofte Idag skal genopfriske sig selv</translation>
     </message>
     <message>
         <source>refresh</source>
         <translation>genopfrisk</translation>
     </message>
 </context>
 </TS>
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
@@ -1,658 +1,566 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Ok</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>&lt;h1&gt;Alarm at %1&lt;/h1&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished">Ikke-arkiverede</translation>
     </message>
 </context>
 <context>
     <name>NewTaskDlg</name>
     <message>
         <source>New Task</source>
         <translation type="unfinished">Ny opgave</translation>
     </message>
     <message>
         <source>Blank task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Using template:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Alarms</source>
         <translation>Alarmer</translation>
     </message>
     <message>
         <source>Information</source>
         <translation>Information</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
         <source>Recurrence</source>
         <translation>Gentagelse</translation>
     </message>
     <message>
         <source>Task Editor</source>
         <translation>Opgave-redigering</translation>
     </message>
 </context>
 <context>
     <name>Opie</name>
     <message>
         <source>Todo List</source>
         <translation type="unfinished">Opgaveliste</translation>
     </message>
     <message>
         <source>Task</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
         <translation>Indtast opgave</translation>
     </message>
     <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>
         <source>Edit</source>
         <translation>Rediger</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Fjern</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Navn</translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation>Ny skabelon %1</translation>
     </message>
     <message>
         <source>Click here to set the priority of new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Klik her for at bestemme prioriteten på den nye opgave.
 
 Dette område kaldes genvejspanelet.
 
 Det hjælper dig med hurtigt at tilføje en ny opgave til din liste. Dette område kan blive vist eller skjules ved at vælge Valgmuligheder-&gt;&apos;Vis genvejspanel&apos; fra menuen foroven.</translation>
     </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>Indtast beskrivelsen af den nye opgave her.
 
 Dette område kaldes genvejspanelet.
 
 Det hjælper dig med hurtigt at tilføje en ny opgave til din liste. Dette område kan blive vist eller skjules ved at vælge Valgmuligheder-&gt;&apos;Vis genvejspanel&apos; fra menuen foroven.</translation>
     </message>
     <message>
         <source>More</source>
         <translation>Mere</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>Klik her for at indtaste yderligere information til den nye opgave.
 
 Dette område kaldes genvejspanelet.
 
 Det hjælper dig med hurtigt at tilføje en ny opgave til din liste. Dette område kan blive vist eller skjules ved at vælge Valgmuligheder-&gt;&apos;Vis genvejspanel&apos; fra menuen foroven.</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Klik her for at tilføje en ny opgave.
 
 Dette område kaldes genvejspanelet.
 
 Det hjælper dig med hurtigt at tilføje en ny opgave til din liste. Dette område kan blive vist eller skjules ved at vælge Valgmuligheder-&gt;&apos;Vis genvejspanel&apos; fra menuen foroven.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Annuller</translation>
     </message>
     <message>
         <source>Click here to reset new task information.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Klik her for at nulstille informationen i den nye opgave.
 
 Dette område kaldes genvejspanelet.
 
 Det hjælper dig med hurtigt at tilføje en ny opgave til din liste. Dette område kan blive vist eller skjules ved at vælge Valgmuligheder-&gt;&apos;Vis genvejspanel&apos; fra menuen foroven.</translation>
     </message>
     <message>
         <source>Data can not be edited, currently syncing</source>
         <translation>Data kan ikke redigeres, er ved at synkronisere</translation>
     </message>
     <message>
         <source>Data can&apos;t be edited, currently syncing</source>
         <translation>Data kan ikke redigeres, er ved at synkronisere</translation>
     </message>
     <message>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>Table View</source>
         <translation>Tabel visning</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ingen</translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation>%1 dag(e)</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>New</source>
         <translation>Ny</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Rediger</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Slet</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Dato</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Tid</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Type</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Description:</source>
         <translation>Beskrivelse:</translation>
     </message>
     <message>
         <source>Enter brief description of the task here.</source>
         <translation>Indtast en kort beskrivelse af opgaven her.</translation>
     </message>
     <message>
         <source>Complete </source>
         <translation>Afsluttet</translation>
     </message>
     <message>
         <source>Work on </source>
         <translation>Arbejde</translation>
     </message>
     <message>
         <source>Buy </source>
         <translation>Køb</translation>
     </message>
     <message>
         <source>Organize </source>
         <translation>Organisere</translation>
     </message>
     <message>
         <source>Get </source>
         <translation>Hent</translation>
     </message>
     <message>
         <source>Update </source>
         <translation>Opdater</translation>
     </message>
     <message>
         <source>Create </source>
         <translation>Opret</translation>
     </message>
     <message>
         <source>Plan </source>
         <translation>Planlægge</translation>
     </message>
     <message>
         <source>Call </source>
         <translation>Ring</translation>
     </message>
     <message>
         <source>Mail </source>
         <translation>Maile</translation>
     </message>
     <message>
         <source>Select priority of task here.</source>
         <translation>Vælg opgavens prioritet her.</translation>
     </message>
     <message>
         <source>Very High</source>
         <translation>Meget høj</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Høj</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Lav</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>Meget lav</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategori:</translation>
     </message>
     <message>
         <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>
 <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>Klik her for at vælge opgavens nuværende status.</translation>
     </message>
     <message>
         <source>Started</source>
         <translation>Påbegyndt</translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation>Udsat</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>Afsluttet</translation>
     </message>
     <message>
         <source>Not started</source>
         <translation>Ikke påbegyndt</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Forløb:</translation>
     </message>
     <message>
         <source>Select progress made on this task here.</source>
         <translation>Angiv opgavens forløb her.</translation>
     </message>
     <message>
         <source>0 %</source>
         <translation>0 %</translation>
     </message>
     <message>
         <source>20 %</source>
         <translation>20 %</translation>
     </message>
     <message>
         <source>40 %</source>
         <translation>40 %</translation>
     </message>
     <message>
         <source>60 %</source>
         <translation>60 %</translation>
     </message>
     <message>
         <source>80 %</source>
         <translation>80 %</translation>
     </message>
     <message>
         <source>100 %</source>
         <translation>100 %</translation>
     </message>
     <message>
         <source>Start Date:</source>
         <translation>Start dato:</translation>
     </message>
     <message>
         <source>Click here to set the date this task was started.</source>
         <translation>Klik her for at vælge datoen denne opgave var påbegyndt.</translation>
     </message>
     <message>
         <source>Due Date:</source>
         <translation>Forventet dato:</translation>
     </message>
     <message>
         <source>Click here to set the date this task needs to be completed by.</source>
         <translation>Klik her for at vælge datoen denne opgave skal afsluttes på.</translation>
     </message>
     <message>
         <source>Completed:</source>
         <translation>Afsluttet:</translation>
     </message>
     <message>
         <source>Click here to mark this task as completed.</source>
         <translation>Klik her for at markere denne opgave som afsluttet.</translation>
     </message>
     <message>
         <source>Click here to set the date this task was completed.</source>
         <translation>Klik her for at vælge datoen denne opgave var afsluttet.</translation>
     </message>
     <message>
         <source>Maintainer Mode:</source>
         <translation>Vedligeholder rolle:</translation>
     </message>
     <message>
         <source>Click here to set the maintainer&apos;s role.</source>
         <translation>Klik her for at vælge vedligeholderens rolle.</translation>
     </message>
     <message>
         <source>Nothing</source>
         <translation>Intet</translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation>Ansvarlig</translation>
     </message>
     <message>
         <source>Done By</source>
         <translation>Afsluttet af</translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation>Tilrettelæggelse</translation>
     </message>
     <message>
         <source>Maintainer:</source>
         <translation>Vedligeholder:</translation>
     </message>
     <message>
         <source>This is the name of the current task maintainer.</source>
         <translation>Dette er navnet på den nuværende opgave vedligeholder.</translation>
     </message>
     <message>
         <source>test</source>
         <translation>test</translation>
     </message>
     <message>
         <source>Click here to select the task maintainer.</source>
         <translation>Klik her for at vælge opgave vedligeholderen.</translation>
     </message>
 </context>
 </TS>
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
@@ -1,35 +1,31 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GroupDialog</name>
     <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>
         <translation>Redigér bruger</translation>
     </message>
 </context>
 </TS>
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,832 +1,566 @@
 <!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>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <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>
         <source>&amp;Import text file</source>
         <translation>Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
         <translation>Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
         <translation>&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation 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>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation 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>
         <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
         <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
         <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
         <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
         <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
         <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
         <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
         <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
         <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
         <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
         <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
         <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
         <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
         <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
         <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
         <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
-        <source>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>
         <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No document defined.
 You have to create a new document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to save </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 before continuing?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Now you have to enter
 a password twice for your
 newly created document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&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>
         <source>&lt;P&gt;You must create a new document first. Ok to create?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Password Manager&lt;br&gt;ZSafe version 2.1.2&lt;br&gt;&lt;/b&gt;by Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Translations by Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,569 +1,489 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation>Kompletter Name</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Kontakt</translation>
     </message>
     <message>
         <source>Pick</source>
         <translation>Auswählen</translation>
     </message>
 </context>
 <context>
     <name>AbView</name>
     <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.
 
 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>
         <source>Unable to find a contact for this search pattern!</source>
         <translation>Suchmuster konnte nicht gefunden werden !</translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation>Die ausgewählte Datei endet
 nicht mit &quot;.vcf&quot;. 
 Wollen Sie sie trotzdem öffnen ?</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>Kontakt hinzufügen?</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>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation>Eingabemuster</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>Benutze reguläre Ausdrücke</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>Benutze Wildcards (*,?)</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Beachte Großschreibung</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Mail</translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation>Bevorzuge QT-Mail</translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation>Bevorzuge Opie-Mail</translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation>Beachte: QT-Mail ist nur im Sharp 
 Default-Rom enthalten. Opie-Mail
 ist frei erhältlich !</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Verschiedenes</translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation>Sucheinstellungen</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Schrift</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Klein</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Groß</translation>
     </message>
     <message>
         <source>Order</source>
         <translation>Reihenfolge</translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation>Wähle Reihenfolge für Kontakt: </translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Hoch</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Runter</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Hinzufügen</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Entfernen</translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
         <source>Click on tab to select one</source>
         <translation>Klicken sie auf den Reiter um diesen auszuwählen</translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation>Einstellungen für den Typ der Suchstil</translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation>Die Suchfunktion erwartet einen regulären Ausdruck, wenn dies ausgewählt wurde</translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
         <translation>Die Suchfunktion erwartet ein simples Suchmuster</translation>
     </message>
     <message>
         <source>If selected, search differs between upper and lower chars</source>
         <translation>Wenn dies ausgewählt wurde unterscheidet die Suche Groß- und Kleinschreibung</translation>
     </message>
     <message>
         <source>Font size for list- and card view</source>
         <translation>Schriftgröße für Liste und Kartenansicht</translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
         <translation>Schrifteinstellungen für Liste und Kartenansicht</translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation>Sofern verfügbar wird Sharps Mailanwendung verwendet</translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</source>
         <translation>OPIEs Mailanwendung wird verwendet</translation>
     </message>
     <message>
         <source>Move selected attribute one line up</source>
         <translation>Ausgewähltes Element eine Zeile nach oben verschieben</translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation>Ausgewähltes Element eine Zeile nach unten verschieben</translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation>Liste aller verfügbaren Elemente</translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation>Hinzufügen des gewählten Elements von der unteren zur oberen Liste</translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation>Entfernen des gewählten Elements aus der oberen Liste</translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation>Reihenfolge (von oben nach unten) definiert den primären Kontakt der in der rechten Spalte angezeigt wird</translation>
     </message>
     <message>
         <source>Tool-/Menubar</source>
         <translation>Werkzeug-/Menüleiste</translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation>Fixiert</translation>
     </message>
     <message>
         <source>Switch to fixed menu-/toolbars after restarting application !</source>
         <translation>Schalter für fixierte Werkzeugleiste - 
 wird nach dem Neustart der Anwendung aktiv!</translation>
     </message>
     <message>
         <source>Moveable</source>
         <translation>Beweglich</translation>
     </message>
     <message>
         <source>Switch to moveable menu-/toolbars after restarting application !</source>
         <translation>Schalter für bewegliche Werkzeugleiste - 
 wird nach dem Neustart der Anwendung aktiv!</translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>First Name</source>
         <translation>Vorname</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Mittlerer Name</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Nachname</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Suffix</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Speichern unter</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Geschlecht</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Berufsbezeichnung</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Organisation</translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation>Voller Name...</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Notizen...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Allgemein</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Geschäftlich</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Privat</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Adresse</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Stadt</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Staat</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>Postleitzahl</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>Land</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>Vereinigte Staaten</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Großbritannien</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation>Albanien</translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation>Algerien</translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation>Amerikanisch Samoa</translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation>Andorra</translation>
     </message>
     <message>
         <source>Angola</source>
         <translation>Angola</translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation>Anguilla</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>Argentinien</translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation>Aruba</translation>
     </message>
     <message>
         <source>Australia</source>
         <translation>Australien</translation>
     </message>
     <message>
         <source>Austria</source>
         <translation>Österreich</translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation>Aserbaidschan</translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation>Bahamas</translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation>Bahrain</translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation>Bangladesch</translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation>Barbados</translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation>Belarus</translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation>Belgien</translation>
     </message>
     <message>
         <source>Belize</source>
         <translation>Belize</translation>
     </message>
     <message>
         <source>Benin</source>
         <translation>Benin</translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation>Bermuda-Inseln</translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation>Bhutan</translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation>Botswana</translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation>Bouvet</translation>
     </message>
     <message>
         <source>Brazil</source>
         <translation>Brasilien</translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
         <translation>Brunei Darussalam</translation>
     </message>
     <message>
         <source>Bulgaria</source>
         <translation>Bulgarien</translation>
     </message>
     <message>
         <source>Burkina Faso</source>
         <translation>Burkina Faso</translation>
     </message>
     <message>
         <source>Burundi</source>
         <translation>Burundi</translation>
     </message>
@@ -1014,552 +934,385 @@ wird nach dem Neustart der Anwendung aktiv!</translation>
     <message>
         <source>Peru</source>
         <translation>Peru</translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation>Philippinen</translation>
     </message>
     <message>
         <source>Poland</source>
         <translation>Polen</translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation>Portugal</translation>
     </message>
     <message>
         <source>Puerto Rico</source>
         <translation>Puerto Rico</translation>
     </message>
     <message>
         <source>Qatar</source>
         <translation>Qatar</translation>
     </message>
     <message>
         <source>Reunion</source>
         <translation>Ile La Réunion</translation>
     </message>
     <message>
         <source>Romania</source>
         <translation>Rumänien</translation>
     </message>
     <message>
         <source>Russia</source>
         <translation>Russland</translation>
     </message>
     <message>
         <source>Rwanda</source>
         <translation>Ruanda</translation>
     </message>
     <message>
         <source>Saint Lucia</source>
         <translation>Santa Lucia</translation>
     </message>
     <message>
         <source>Samoa</source>
         <translation>Samoa</translation>
     </message>
     <message>
         <source>San Marino</source>
         <translation>San Marino</translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
         <translation>Saudi Arabien</translation>
     </message>
     <message>
         <source>Senegal</source>
         <translation>Senegal</translation>
     </message>
     <message>
         <source>Seychelles</source>
         <translation>Seychellen</translation>
     </message>
     <message>
         <source>Sierra Leone</source>
         <translation>Sierra Leone</translation>
     </message>
     <message>
         <source>Singapore</source>
         <translation>Singapur</translation>
     </message>
     <message>
         <source>Slovakia</source>
         <translation>Slovakei</translation>
     </message>
     <message>
         <source>Slovenia</source>
         <translation>Slovenien</translation>
     </message>
     <message>
         <source>Solomon Islands</source>
         <translation>Solomon-Inseln</translation>
     </message>
     <message>
         <source>Somalia</source>
         <translation>Somalia</translation>
     </message>
     <message>
         <source>South Africa</source>
         <translation>Südafrika</translation>
     </message>
     <message>
         <source>Spain</source>
         <translation>Spanien</translation>
     </message>
     <message>
         <source>Sri Lanka</source>
         <translation>Sri Lanka</translation>
     </message>
     <message>
         <source>St. Helena</source>
         <translation>Sankt Helena</translation>
     </message>
     <message>
         <source>Sudan</source>
         <translation>Sudan</translation>
     </message>
     <message>
         <source>Suriname</source>
         <translation>Suriname</translation>
     </message>
     <message>
         <source>Swaziland</source>
         <translation>Swasiland</translation>
     </message>
     <message>
         <source>Sweden</source>
         <translation>Schweden</translation>
     </message>
     <message>
         <source>Switzerland</source>
         <translation>Schweiz</translation>
     </message>
     <message>
         <source>Taiwan</source>
         <translation>Taiwan</translation>
     </message>
     <message>
         <source>Tajikistan</source>
         <translation>Tadschikistan</translation>
     </message>
     <message>
         <source>Tanzania</source>
         <translation>Tansania</translation>
     </message>
     <message>
         <source>Thailand</source>
         <translation>Thailand</translation>
     </message>
     <message>
         <source>Togo</source>
         <translation>Togo</translation>
     </message>
     <message>
         <source>Tokelau</source>
         <translation>Tokelau</translation>
     </message>
     <message>
         <source>Tonga</source>
         <translation>Tonga</translation>
     </message>
     <message>
         <source>Tunisia</source>
         <translation>Tunesien</translation>
     </message>
     <message>
         <source>Turkey</source>
         <translation>Türkei</translation>
     </message>
     <message>
         <source>Turkmenistan</source>
         <translation>Turkmenistan</translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation>Tuvalu</translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation>Uganda</translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation>Ukraine</translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation>Uruguay</translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation>Usbekistan</translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation>Vanuatu</translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation>Venezuela</translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation>Jungfraueninseln</translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation>Westsahara</translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation>Jemen</translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation>Jugoslavien</translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation>Sambia</translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation>Zimbabwe</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Männlich</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Weiblich</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Details</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>Notiz eingeben</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>Namen ändern</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Geburtstag</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Jahrestag</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Kontakte</translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation>Kuwait</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Unbekannt</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Afghanistan</source>
         <translation>Afghanistan</translation>
     </message>
     <message>
         <source>Antarctica</source>
         <translation>Antarktis</translation>
     </message>
     <message>
         <source>Armenia</source>
         <translation>Armenien</translation>
     </message>
     <message>
         <source>Bolivia</source>
         <translation>Bolivien</translation>
     </message>
     <message>
         <source>Cameroon</source>
         <translation>Kamerun</translation>
     </message>
     <message>
         <source>Ghana</source>
         <translation>Ghana</translation>
     </message>
     <message>
         <source>Guadeloupe</source>
         <translation>Guadeloupe</translation>
     </message>
     <message>
         <source>Guinea-Bissau</source>
         <translation>Guinea-Bissau</translation>
     </message>
     <message>
         <source>Jamaica</source>
         <translation>Jamaika</translation>
     </message>
     <message>
         <source>Kiribati</source>
         <translation>Kiribati</translation>
     </message>
     <message>
         <source>Kyrgyzstan</source>
         <translation>Kyrgyzstan</translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
         <translation>Palestina</translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
         <translation>Pitcairn Inseln</translation>
     </message>
     <message>
         <source>Vietnam</source>
         <translation>Vietnam</translation>
     </message>
     <message>
         <source>Press to enter last- middle and firstname</source>
         <translation>Hier Klicken, um Vor-, Mittel- und Nachnamen einzugeben</translation>
     </message>
     <message>
         <source>Enter fullname directly ! If you have a lastname with multiple words ( for instance &quot;de la Guerra&quot;), please write &lt;lastname&gt;,&lt;firstnames&gt; like this: &quot;de la Guerra, Carlos Pedro&quot;</source>
         <translation>Geben Sie hier den vollen Namen direkt ein ! Wenn Ihr letzter Name aus mehreren Worten besteht (bspw. &quot;von der Vogelweide&quot;), schreiben Sie ihn bitte als &lt;Nachname&gt;,&lt;Vornamen&gt; wie bspw. &quot;von der Vogelweide, Walter Maria&quot;</translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation>Die Berufsbezeichnug..</translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation>Suffixe wie bspw. &quot;jr.&quot;..</translation>
     </message>
     <message>
         <source>The working place of the contact</source>
         <translation>Die Arbeitsstelle des Kontakts</translation>
     </message>
     <message>
         <source>Press to select attribute to change</source>
         <translation>Hier Klicken um ein Attribut zu ändern</translation>
     </message>
     <message>
         <source>Press to select how to store the name (and howto show it in the listview)</source>
         <translation>Hier auswählen, wie der Name gespeichert wird (und wie er in der Liste erscheint)</translation>
     </message>
     <message>
         <source></source>
         <translation></translation>
     </message>
 </context>
 <context>
     <name>Opie</name>
     <message>
         <source>Contact</source>
         <translation>Kontakt</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Kontakte</translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation>Suche starten</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation>E-Mail schreiben an</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation>vCard importieren</translation>
     </message>
     <message>
         <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
@@ -1,450 +1,360 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>AdvancedFm</source>
         <translation>Erweiterter Dateimanager</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ansicht</translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation>Versteckte Dateien anzeigen</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>Verzeichnis erstellen</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Umbenennen</translation>
     </message>
     <message>
         <source>Run Command</source>
         <translation>Befehl ausführen</translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation>Befehl ausführen mit Ausgabe</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <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>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
         <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>
         <source>Ir sent.</source>
         <translation>Ir versandt.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>Verzeichnis wechseln</translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>Ausführen</translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation>Als Text öffnen</translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation>Symlink erstellen</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Kopieren</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>Verschieben</translation>
     </message>
     <message>
         <source>File Info</source>
         <translation>Dateiinfo</translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation>Berechtigungen setzen</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Eigenschaften</translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation>Datei Beamen</translation>
     </message>
     <message>
         <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>
         <source>Refresh</source>
         <translation>Aktualisieren</translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1 files?&lt;/p&gt;</source>
         <translation>&lt;p&gt;%1 Datei(en) löschen?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1 and all it&apos;s contents?&lt;/p&gt;</source>
         <translation>&lt;p&gt;%1 samt Inhalt löschen?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1?&lt;/p&gt;</source>
         <translation>&lt;p&gt;%1 wirklich löschen?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Really copy %1 files?&lt;/p&gt;</source>
         <translation>&lt;p&gt;%1 wirklich kopieren?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 already  exists. Ok to overwrite?&lt;/P&gt;</source>
         <translation>&lt;p&gt;%1 existiert bereits. Überschreiben?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;P&gt;Could not copy %1 to %2&lt;/P&gt;</source>
         <translation>&lt;p&gt;Kann %1 nicht nach %2 kopieren&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Copy %1 As</source>
         <translation>Kopiere %1 als</translation>
     </message>
     <message>
         <source>&lt;P&gt; %1 already exists. Ok to overwrite?&lt;/p&gt;</source>
         <translation>&lt;p&gt;%1 existiert bereits. Überschreiben?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not copy %1 to %2&lt;/P&gt;</source>
         <translation>&lt;p&gt;Kann %1 nicht nach %2 kopieren&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt; %1 already exists. Do you really want to delete it?&lt;/P&gt;</source>
         <translation>&lt;p&gt;%1 existiert bereits. Überschreiben?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not move %1&lt;/p&gt;</source>
         <translation>&lt;p&gt;Kann %1 nicht verschieben&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not copy %1 to %2&lt;/p&gt;</source>
         <translation>&lt;p&gt;Kann %1 nicht nach %2 kopieren&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Ausgabe in Datei speichern (nur Name)</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Ausgabe</translation>
     </message>
     <message>
         <source>Process could not start</source>
         <translation>Prozess konnte nicht gestartet werden</translation>
     </message>
     <message>
         <source>Error
 </source>
         <translation>Fehler</translation>
     </message>
     <message>
         <source>
 Finished
 </source>
         <translation>
 Fertig</translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Berechtigungen setzen</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Berechtigungen setzen für:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>Eigentümer</translation>
     </message>
     <message>
         <source>group</source>
         <translation>Gruppe</translation>
     </message>
     <message>
         <source>others</source>
         <translation>andere</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Eigentümer</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Gruppe</translation>
     </message>
     <message>
         <source>read</source>
         <translation>Lesen</translation>
     </message>
     <message>
         <source>write</source>
         <translation>Schreiben</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>Ausführen</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation>Fehler - kein Benutzer</translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation>Fehler - keine Gruppe</translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation>Fehler beim Setzen der Grupper oder des Besitzers</translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation>Fehler beim Setzen des Modus</translation>
     </message>
     <message>
         <source>filePermissions</source>
         <translation>dateiBerechtigungen</translation>
     </message>
 </context>
 </TS>
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
@@ -1,288 +1,229 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Appearance</name>
     <message>
         <source>Settings...</source>
         <translation>Einstellungen...</translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation>Aktuelles Schema</translation>
     </message>
     <message>
         <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>
         <source>Drop down list</source>
         <translation>Aufklappliste</translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation>Aufklappliste m. Symb. </translation>
     </message>
     <message>
         <source>Top</source>
         <translation>Oben</translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation>Unten</translation>
     </message>
     <message>
         <source>Style</source>
         <translation>Stil</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Schrift</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Farben</translation>
     </message>
     <message>
         <source>Windows</source>
         <translation>Fenster</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Fortgeschritten</translation>
     </message>
     <message>
-        <source>Restart</source>
-        <translation 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>
     </message>
     <message>
         <source>Window decorations control the way the application title bar and its buttons appear.
 
 Click here to select an available decoration.</source>
         <translation>Windowdekorationen kontrollieren die Art der Titelleiste und der entsprechenden Buttons
 Klicken Sie hier um eine verfügbare Dekoration auszuwählen.</translation>
     </message>
     <message>
         <source>Select the desired name, style and size of the default font applications will use.</source>
         <translation>Wählen Sie hier Namen, Stil und Größe des Standardfonts, den alle Anwendungen verwenden.</translation>
     </message>
     <message>
         <source>Color schemes are a collection of colors which are used for various parts of the display.
 
 Click here to select an available scheme.</source>
         <translation>Farbschemata sind ein eSammlung von Farben, welche für verschiedene Teile der Anzeige verwendet werden.
 Klicken Sie hier, um ein verfügbares Farbschema auszuwählen.</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation>Klicken Sie hier, um alle Reiter im oberen Teil zu positionieren.</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation>Klicken Sie hier, um alle Reiter im unteren Teil zu positionieren.</translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation>Dies ist das Vorschaufenster. Hier können Sie sehen, wie das neue Erscheinungsbild durch Ihre Änderungen beeinflusst wird.</translation>
     </message>
     <message>
         <source>Appearance Settings</source>
         <translation>Erscheinungsbild-Einstellungen</translation>
     </message>
     <message>
         <source>Rotation direction:</source>
         <translation>Rotationsrichtung: </translation>
     </message>
     <message>
         <source>Show Scrollbars on the left</source>
         <translation>Zeige Bildlaufleisten auf der rechten Seite</translation>
     </message>
     <message>
         <source>Click here to display scrollbars on the left side instead of the right.</source>
         <translation>Klicke hier, um Bildlaufleisten auf der rechten Seite anzuzeigen.</translation>
     </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation>Schema editieren</translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation>Klicken Sie hier zum Aussuchen einer Farbe für:</translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
         <translation>Beispiel</translation>
     </message>
     <message>
         <source>Normal Item</source>
         <translation>Normales Element</translation>
     </message>
     <message>
         <source>Disabled Item</source>
         <translation>Deaktiviertes Element</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Menü</translation>
     </message>
     <message>
         <source>Normal Text</source>
         <translation>Normaler Text</translation>
     </message>
     <message>
         <source>Highlighted Text</source>
         <translation>Markierter Text</translation>
     </message>
     <message>
         <source>Button</source>
         <translation>Knopf</translation>
     </message>
     <message>
         <source>Check Box</source>
         <translation>Checkbox</translation>
     </message>
     <message>
         <source>Sample window using the selected settings.</source>
         <translation>Beispielfenster mit den gewählten Einstellungen.</translation>
     </message>
 </context>
 </TS>
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
@@ -1,710 +1,670 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation>Kategorienfilter</translation>
     </message>
     <message>
         <source>Select one or more groups</source>
         <translation>Wählen Sie eine oder mehrere Gruppen</translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation>Lese Konfiguration ...</translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancel</translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
     <message>
         <source>Remove
 </source>
         <translation>Entfernen
 </translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation>Installieren
 </translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation>Aktualisieren
 </translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation>(Neuinstallation)</translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation>(Aktualisierung)</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation>Ziel</translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation>Verf. Speicher</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Ausgabe</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Starten</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Optionen</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Text</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation>Abbruch</translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation>
 **** Benutzerabbruch ****</translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation>**** Vorgang abgebrochen ****</translation>
     </message>
     <message>
         <source>Save output</source>
         <translation>Ausgabe speichern</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Unbekannt</translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation>%1 kB</translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation>Optionen</translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation>--force-depends</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation>--force-reinstall</translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation>--force-removal</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation>--force-overwrite</translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation>Informationslevel</translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation>Nur Fehler</translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation>Normale Meldungen</translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation>Informative Meldungen</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation>Ausgaben zur Fehlersuche</translation>
     </message>
 </context>
 <context>
     <name>Ipkg</name>
     <message>
         <source>Dealing with package %1</source>
         <translation> Bearbeite Paket %1</translation>
     </message>
     <message>
         <source>Removing symbolic links...
 </source>
         <translation>Löschen symbolischer Links...
 </translation>
     </message>
     <message>
         <source>Creating symbolic links for %1.</source>
         <translation>Erstellung symbolischer Links für %1.</translation>
     </message>
     <message>
         <source>Creating symbolic links for %1</source>
         <translation>Erstellung symbolischer Links für %1</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>Erledigt</translation>
     </message>
     <message>
         <source>Removing status entry...</source>
         <translation>Entfernen des Statuseintrags...</translation>
     </message>
     <message>
         <source>status file - </source>
         <translation>Statusdatei -</translation>
     </message>
     <message>
         <source>package - </source>
         <translation>Paket-</translation>
     </message>
     <message>
         <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>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation>AQPkg- der Paketmanager</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation>Tippen Sie den Suchtext hier ein.</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation>Klicken Sie hier um die alphabetische Schnellleiste auszublenden.</translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation>Listen aktualisieren</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation>Klicken Sie hier für eine aktualisierte Fassung der Serverliste.</translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation>Aktualisieren</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation>Klicken Sie hier, um alle installierten Pakete zu aktualisieren, siofern eine neuere Version vorhanden ist.</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Download</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation>Klicken Sie hier um das ausgewählte Paket downzuloaden.</translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation>Übernehmen</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation>Klicken Sie hier, um das ausgewählte Paket zu löschen oder zu aktualisieren.</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Aktion</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation>Nicht installierte Pakete anz.</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation>Klicken Sie hier um Pakete anzuzeigen, die nicht installiert wurden.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation>Installierte Pakete anzeigen</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation>Klicken Sie hier um installierte Pakete anzuzeigen.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation>Aktualisierte Pakete anz.</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation>Klicke Sie hier um nur installierte Pakete anzuzeigen, für die eine neuere Version verfügbar ist.</translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation>Filtern n. Kategorie</translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation>Klicken Sie hier um Pakete aufzulisten, die einer bestmmten Kategorie zugehören.</translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation>Filterkategorie setzen</translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation>Klicken Sie hier um die Paketkategorie in den verwendeten Filter zu übernehmen.</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation>Klicken Sie hier um Text in Paketnamen zu suchen.</translation>
     </message>
     <message>
         <source>Find next</source>
         <translation>Nächstes finden</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation>Klicken Sie hier um das nächste Paket mit Ihrem Suchtext zu finden.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation>Alphabetische Schnellleiste</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation>Klicken Sie hier um die alphabetische Schnellliste ein- und auszublenden.</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Anzg.</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Konfiguration</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation>Klicken Sie hier um die Anwendung zu konfigurieren.</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation>Klicken Sie hier um die Finden-Leiste auszublenden.</translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation>Server: </translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation>Klicken Sie hier, um einen Feedserver auszuwählen.</translation>
     </message>
     <message>
         <source>Packages</source>
         <translation>Pakete</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 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>Dies ist eine Liste aller Pakete des oben gewählten Feed-Servers.
 Eine blaue Kugel neben dem Paketnamen zeigt an dass das Paket zur Zeit installiert ist.
 Ein blauer Punkt mit einem gelben Stern zeit dass eine neuere Version des Pakets auf dem Server verfügbar ist.
 Um ein Paket auszuwählen klicken Sie in das Rechtecke auf der linken Seite.</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation>Klicken Sie hier um asgewählte Pakete zu entfernen</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation>Serverlistenerstellung: 
 <byte value="x9"/>%1
 </translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation>Paketlistenerstellung für:
 <byte value="x9"/>%1</translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
         <translation>Aktualisierung der Paketliste</translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation>WARNUNG !!!
 Ein Upgrade während
 OPIE/Qtopia läuft ist
 nicht zu empfehlen.
 
 Sind Sie sicher ?</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
         <translation>Installierte Pakete upgraden</translation>
     </message>
     <message>
         <source>Are you sure you wish to delete
 %1?</source>
         <translation>Sind Sie sicher %1 
 löschen zu wollen ?</translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation>Sind Sie sicher ?</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nein</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
         <source>Download to where</source>
         <translation>Wohin downloaden </translation>
     </message>
     <message>
         <source>Enter path to download to</source>
         <translation>Geben Sie den Downloadpfad ein</translation>
     </message>
     <message>
         <source>Install Remote Package</source>
         <translation>Entferntes Paket installieren</translation>
     </message>
     <message>
         <source>Enter package location</source>
         <translation>Geben Sie die Paketquelle ein</translation>
     </message>
     <message>
         <source>Nothing to do</source>
         <translation>Nichts zu tun</translation>
     </message>
     <message>
         <source>No packages selected</source>
         <translation>Keine Pakete ausgewählt</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Do you wish to remove or reinstall
 %1?</source>
         <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>
         <translation>&lt;p&gt;&lt;b&gt;Installiert&lt;/B&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Größe&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Sektion&lt;/b&gt; -</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Dateiname&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Installiete Version&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Verfügbare Version&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>Package Information</source>
         <translation>Paketinformation</translation>
     </message>
     <message>
         <source>Package information is unavailable</source>
         <translation>Paketinformation nicht verfügbar</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Installed packages</source>
         <translation>Installierte pakete</translation>
     </message>
     <message>
         <source>Local packages</source>
         <translation>Lokale Pakete</translation>
     </message>
     <message>
         <source>N/A</source>
         <translation>Nicht verfügbar</translation>
     </message>
     <message>
         <source>Package - %1
               version - %2</source>
         <translation>Paket- %1
 Version- %2</translation>
     </message>
     <message>
         <source>
               inst version - %1</source>
         <translation>
 installierte Version- %1</translation>
     </message>
     <message>
         <source>Version string is empty.</source>
         <translation>Versionsnummer ist leer.</translation>
     </message>
     <message>
         <source>Epoch in version is not number.</source>
         <translation>Epochennumer ist keine Zahl.</translation>
     </message>
     <message>
         <source>Nothing after colon in version number.</source>
         <translation>Kein Wert nach Doppelpunkt in der Versionsnummer.</translation>
     </message>
 </context>
 <context>
     <name>QuestionDlg</name>
     <message>
         <source>Remove</source>
         <translation>Löschen</translation>
     </message>
 </context>
 <context>
     <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation>Konfiguration</translation>
     </message>
     <message>
         <source>Servers</source>
         <translation>Server</translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation>Ziele</translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation>Proxys</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Name: </translation>
     </message>
     <message>
         <source>Address:</source>
         <translation>Adresse:</translation>
     </message>
     <message>
         <source>Active Server</source>
         <translation>Aktive Server</translation>
     </message>
     <message>
         <source>Update</source>
         <translation>Aktualisierung</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation>Ziel</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Ort:</translation>
     </message>
     <message>
         <source>Link to root</source>
         <translation>Mit Root verlinken</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
         <translation>HTTP Proxy</translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation>Aktiviert</translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation>FTP Proxy</translation>
     </message>
     <message>
         <source>Username:</source>
         <translation>Benutzername:</translation>
     </message>
     <message>
         <source>Password:</source>
         <translation>Passwort:</translation>
     </message>
 </context>
 </TS>
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,178 +1,150 @@
 <!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>
     </message>
     <message>
         <source>Backup Failed!</source>
         <translation>Sicherung fehlgeschlagen!</translation>
     </message>
     <message>
         <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>
         <source>Restore Backup...</source>
         <translation>Rückspielen...</translation>
     </message>
     <message>
         <source>&lt;qt&gt;%1&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;%1&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation>Wiederherstellen</translation>
     </message>
     <message>
         <source>Would you really overwrite your local data?</source>
         <translation>Möchten Sie wirklich Ihre lokalen Daten überschreiben?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nein</translation>
     </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <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>
         <translation>Fehler Meldung:</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
 </context>
 </TS>
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
@@ -1,189 +1,177 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BacDialog</name>
     <message>
         <source>Blood Alcohol Estimator</source>
         <translation>Blutalkoholschätzung</translation>
     </message>
     <message>
         <source># Drinks Consumed</source>
         <translation># konsumierte Getränke</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation>Gewicht</translation>
     </message>
     <message>
         <source>Kilos</source>
         <translation>Kilos</translation>
     </message>
     <message>
         <source>Pounds</source>
         <translation>Pfunde</translation>
     </message>
     <message>
         <source>Units</source>
         <translation>Einheiten</translation>
     </message>
     <message>
         <source>Period of Time (hours)</source>
         <translation>vergangene Zeit (Stunden)</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Männlich</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Weiblich</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Unbekannt</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Geschlecht</translation>
     </message>
     <message>
         <source>Beer</source>
         <translation>Bier</translation>
     </message>
     <message>
         <source>Wine</source>
         <translation>Wein</translation>
     </message>
     <message>
         <source>Shot</source>
         <translation>Schuß</translation>
     </message>
     <message>
         <source>Type of drink</source>
         <translation>Getränketyp</translation>
     </message>
     <message>
         <source>Calculate</source>
         <translation>Berechnen</translation>
     </message>
 </context>
 <context>
     <name>Bartender</name>
     <message>
         <source>Bartender</source>
         <translation>Bartender</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Datei</translation>
     </message>
     <message>
         <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>
         <source>Name of Drink</source>
         <translation>Getränkename</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Notiz</translation>
     </message>
     <message>
         <source>Drink database not opened sucessfully.
 </source>
         <translation>Getränkedatenbank nich erfolgreich geöffnet.
 </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>
     </message>
     <message>
         <source>Edit Drink</source>
         <translation>Getränk bearbeiten</translation>
     </message>
     <message>
         <source>Failed to write to drink database!
 </source>
         <translation>Konnte nicht in die Getränkedatenbank schreiben!
 </translation>
     </message>
     <message>
         <source>Ingredient</source>
         <translation>Zutat</translation>
     </message>
 </context>
 <context>
     <name>New_Drink</name>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Ingredients</source>
         <translation>Inhalte</translation>
     </message>
 </context>
 <context>
     <name>Show_Drink</name>
     <message>
         <source>Edit</source>
         <translation>Bearbeiten</translation>
     </message>
 </context>
 </TS>
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,340 +1,332 @@
 <!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>
         <source>CE</source>
         <translation>CE</translation>
     </message>
     <message>
         <source>log</source>
         <translation>log</translation>
     </message>
     <message>
         <source>ln</source>
         <translation>ln</translation>
     </message>
     <message>
         <source>(</source>
         <translation>(</translation>
     </message>
     <message>
         <source>)</source>
         <translation>)</translation>
     </message>
     <message>
         <source>sin</source>
         <translation>sin</translation>
     </message>
     <message>
         <source>cos</source>
         <translation>cos</translation>
     </message>
     <message>
         <source>tan</source>
         <translation>tan</translation>
     </message>
     <message>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
         <source>+/-</source>
         <translation>+/-</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>=</source>
         <translation>=</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>.</source>
         <translation>.</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <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>
         <translation>Gewicht
 </translation>
     </message>
     <message>
         <source>Distance</source>
         <translation>Distanz</translation>
     </message>
     <message>
         <source>Area</source>
         <translation>Radial</translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation>Temperatur</translation>
     </message>
     <message>
         <source>Volume</source>
         <translation>Volumen</translation>
     </message>
     <message>
         <source>acres</source>
         <translation>acres</translation>
     </message>
     <message>
         <source>&#xb0;C</source>
         <translation>°C</translation>
     </message>
     <message>
         <source>carats</source>
         <translation>karat</translation>
     </message>
     <message>
         <source>cm</source>
         <translation>cm</translation>
     </message>
     <message>
         <source>cu cm</source>
         <translation>cm³</translation>
     </message>
     <message>
         <source>cu ft</source>
         <translation>ft³</translation>
     </message>
     <message>
         <source>cu in</source>
         <translation>inch³</translation>
     </message>
     <message>
         <source>&#xb0;F</source>
         <translation>°F</translation>
     </message>
     <message>
         <source>fl oz (US)</source>
         <translation>fl oz (US)</translation>
     </message>
     <message>
         <source>ft</source>
         <translation>foot</translation>
     </message>
     <message>
         <source>g</source>
         <translation>g</translation>
     </message>
     <message>
         <source>gal (US)</source>
         <translation>gal (US)</translation>
     </message>
     <message>
         <source>hectares</source>
         <translation>hektar</translation>
     </message>
     <message>
         <source>in</source>
         <translation>inch</translation>
     </message>
     <message>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
         <source>km</source>
         <translation>km</translation>
     </message>
     <message>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
         <source>lb</source>
         <translation>pfund</translation>
     </message>
     <message>
         <source>Lg tons</source>
         <translation>long tons</translation>
     </message>
     <message>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
         <source>mg</source>
         <translation>mg</translation>
     </message>
     <message>
         <source>mi</source>
         <translation>mile</translation>
     </message>
     <message>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
         <source>mm</source>
         <translation>mm</translation>
     </message>
     <message>
         <source>naut. mi</source>
         <translation>Seemeilen</translation>
     </message>
     <message>
         <source>oz</source>
         <translation>unze</translation>
     </message>
     <message>
         <source>points</source>
         <translation>points</translation>
     </message>
     <message>
         <source>pt</source>
         <translation>pint</translation>
     </message>
     <message>
         <source>qt</source>
         <translation>quart</translation>
     </message>
     <message>
         <source>sq cm</source>
         <translation>cm²</translation>
     </message>
     <message>
         <source>sq ft</source>
         <translation>ft²</translation>
     </message>
     <message>
         <source>sq in</source>
         <translation>inch²</translation>
     </message>
     <message>
         <source>sq km</source>
         <translation>km²</translation>
     </message>
     <message>
         <source>sq m</source>
         <translation>m²</translation>
     </message>
     <message>
         <source>sq mi</source>
         <translation>mile²</translation>
     </message>
     <message>
         <source>sq mm</source>
         <translation>mm²</translation>
     </message>
     <message>
         <source>sq yd</source>
         <translation>yard²</translation>
     </message>
     <message>
         <source>st</source>
         <translation>stone</translation>
     </message>
     <message>
         <source>St tons</source>
         <translation>short tons</translation>
     </message>
     <message>
         <source>tblspoon</source>
         <translation>Esslöffel</translation>
     </message>
     <message>
         <source>teaspoons</source>
         <translation>Teelöffel</translation>
     </message>
     <message>
         <source>tonnes</source>
         <translation>tonnen</translation>
     </message>
     <message>
         <source>yd</source>
         <translation>yard</translation>
     </message>
 </context>
 </TS>
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
@@ -1,747 +1,639 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation>Kontobuch</translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation>Neues Konto</translation>
     </message>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation>Transaktionen</translation>
     </message>
     <message>
         <source>Charts</source>
         <translation>Auswertung</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Name:</translation>
     </message>
     <message>
         <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>
         <source>Enter account number for this checkbook here.</source>
         <translation>Geben Sie hier die Kontonummer für dieses Konto hier ein.</translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation>PIN: </translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation>Geben Sie hier die PIN für dieses Konto ein.</translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation>Startguthaben: </translation>
     </message>
     <message>
         <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>
         <translation>Beschreibung</translation>
     </message>
     <message>
         <source>Amount</source>
         <translation>Menge</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation>Klicken Sie hier um eine neue Transaktion anzulegen.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Bearbeiten</translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation>Wählen Sie eine Transaktion und klicken Sie hier um sie zu bearbeiten.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation>Wählen sie ein Konto und klicken Sie hier um es zu löschen.</translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation>Wählen Sie den gewünschten Graphen und klicken Sie den &lt;b&gt;Zeichnen&lt;/b&gt;-Schalter.</translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation>Wählen Sie hier den gewünschten Graphen.</translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation>Kontostand</translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation>Ausgaben n. Kategorie</translation>
     </message>
     <message>
         <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>
         <source>Num</source>
         <translation>Nummer</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Geben Sie ein Passwort ein</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Bitte geben Sie ein Passwort ein: </translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation>Bestätigen Sie das Passwort</translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation>Bitte bestätigen Sie das Passwort:</translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation>Bitte geben Sie das Passwort ein um die Aufhebung des Passwortschutzes zu bestätigen:</translation>
     </message>
     <message>
         <source>Sort by:</source>
         <translation>Sortiert nach:</translation>
     </message>
     <message>
         <source>Select checkbook sorting here.</source>
         <translation>Wählen Sie hier die Sortierung des Scheckbuches.</translation>
     </message>
     <message>
         <source>Entry Order</source>
         <translation>Eintragsreihenfolge</translation>
     </message>
     <message>
         <source>Number</source>
         <translation>Nummer</translation>
     </message>
     <message>
         <source>Id</source>
         <translation>Id</translation>
     </message>
     <message>
         <source>SortDate</source>
         <translation>Sortierdatum</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>Kontostand</translation>
     </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation>Kontokonfiguration</translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation>Geben Sie das Währungssymbol ein:</translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation>Geben Sie Ihr lokales Währungssymbol hier ein.</translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation>Anzeigen der Passwortschutzfunktion</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
         <translation>Klicken Sie hier, um den Passwortschutz im Hauptfenster anzuzeigen.</translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation>Anzeige der Kontostände</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation>Klicken Sie hier, um die Anzeige der Kontostände der einzelnen Konten im Hauptfenster angezeigt werden sollen.</translation>
     </message>
     <message>
         <source>&amp;Settings</source>
         <translation>&amp;Einstellungen</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
         <source>New Account Type</source>
         <translation>Neuer Account Typ</translation>
     </message>
     <message>
         <source>&amp;Account Types</source>
         <translation>&amp;Account Typen</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>Neue Kategorie</translation>
     </message>
     <message>
         <source>Expense</source>
         <translation>Aufwand</translation>
     </message>
     <message>
         <source>Income</source>
         <translation>Einkommen</translation>
     </message>
     <message>
         <source>&amp;Categories</source>
         <translation>&amp;Kategorien</translation>
     </message>
     <message>
         <source>Payee</source>
         <translation>Empfänger</translation>
     </message>
     <message>
         <source>New Payee</source>
         <translation>Neuer Empfänger</translation>
     </message>
     <message>
         <source>&amp;Payees</source>
         <translation>&amp;Empfänger</translation>
     </message>
     <message>
         <source>Open last checkbook</source>
         <translation>Letztes Konto öffnen</translation>
     </message>
     <message>
         <source>Click here to select whether the last open checkbook will be opened at startup.</source>
         <translation>Hier Klicken um auszuwählen, ob das letztbearbeitete Konto beim Start geöffnet werden soll.</translation>
     </message>
     <message>
         <source>Show last checkbook tab</source>
         <translation>Letzten Kontoreiter anzeigen</translation>
     </message>
     <message>
         <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
         <translation>Hier klicken um auszuwählen, ob der letzte Reiter eines Kontos angezeigt werden soll.</translation>
     </message>
     <message>
         <source>Save new description as payee</source>
         <translation>Neue Beschreibung als Empfänger speichern</translation>
     </message>
     <message>
         <source>Click here to save new descriptions in the list of payess.</source>
         <translation>Klicken Sie hier, um die neue Beschreibung in der Liste der Empfänger zu speichern.</translation>
     </message>
 </context>
 <context>
     <name>ListEdit</name>
     <message>
         <source>Add</source>
         <translation>Hinzufügen</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation>Konto</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation>Klicken Sie hier, um ein neues Konto anzulegen.
 Sie können auch &lt;b&gt;Neu&lt;/b&gt; aus dem Konto-Menü wählen.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Berabeiten</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation>Wählen Sie ein ein Konto und klicken Sie hier um es zu bearbeiten.
 Sie können auch &lt;b&gt;Bearbeiten&lt;/b&gt; aus dem Konto-menü wählen oder mit dem Stift auf einen Kontobuch dücken und ihn kurz dort halten.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation>Wählen Sie ein Konto und klicken Sie hier um es zu löschen.
 Sie können auch &lt;b&gt;Löschen&lt;/b&gt; aus dem Konto-menü wählen.</translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation>Dies ist eine Auflistung aller verfügbaren Konten.</translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation>Konto löschen</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Konfigurieren</translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation>Klicken Sie hier um die Anwendung zu konfigurieren.</translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation>Kontoname</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>Kontostand</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Passwort-Eingabe</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Bitt geben Sie Ihr Passwort ein:</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Bearbeiten</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Savings</source>
         <translation>Ersparnisse</translation>
     </message>
     <message>
         <source>Checking</source>
         <translation>Rechnung</translation>
     </message>
     <message>
         <source>CD</source>
         <translation>CD</translation>
     </message>
     <message>
         <source>Money market</source>
         <translation>Geldmarkt</translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation>Anlagefont</translation>
     </message>
     <message>
         <source>Other</source>
         <translation>Andere</translation>
     </message>
     <message>
         <source>Expense</source>
         <translation>Aufwand</translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation>Auto</translation>
     </message>
     <message>
         <source>Bills</source>
         <translation>Rechnungen</translation>
     </message>
     <message>
         <source>CDs</source>
         <translation>CDs</translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation>Kleidung</translation>
     </message>
     <message>
         <source>Computer</source>
         <translation>Computer</translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation>DVDs</translation>
     </message>
     <message>
         <source>Electronics</source>
         <translation>Elektronik</translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation>Unterhaltung</translation>
     </message>
     <message>
         <source>Food</source>
         <translation>Nahrungsmittel</translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation>Kraftstoff</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Sonstiges</translation>
     </message>
     <message>
         <source>Movies</source>
         <translation>Filme</translation>
     </message>
     <message>
         <source>Rent</source>
         <translation>Miete</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Reise</translation>
     </message>
     <message>
         <source>Income</source>
         <translation>Einkommen</translation>
     </message>
     <message>
         <source>Work</source>
         <translation>Arbeit</translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation>Familienmitgiled</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation>Kreditsache</translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation>Transaktion für </translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation>Ausgabe</translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation>Wählen Sie hier ob es sich um eine Einnahme oder Ausgabe handelt.</translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation>Einnahme</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Datum: </translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation>Wählen Sie das Transaktionsdatum hier.</translation>
     </message>
     <message>
         <source>Number:</source>
         <translation>Nummer: </translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation>Geben Sie hier die Nummer ein.</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Beschreibung: </translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation>Geben Sie hier die Beschreibung der Transaktion ein.</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorie: </translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation>Wählen Sie die Transaktionskategorie  hier.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Typ: </translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation>Wählen Sie den Transaktionstyp hier.
 Die verfügbaren Optionen hängen davon ab, ob es sich um eine Einnahme oder Ausgabe handelt.</translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation>Menge: </translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation>Geben Sie den Wert der Transaktion hier an.
 Der eingegebene sollte immer positiv sein.</translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation>Gebühr: </translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 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
@@ -1,288 +1,207 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AlarmDlg</name>
     <message>
         <source>Clock</source>
         <translation>Uhr</translation>
     </message>
     <message>
         <source>Snooze</source>
         <translation>Schlummern</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
 </context>
 <context>
     <name>AlarmDlgBase</name>
     <message>
         <source>Form1</source>
         <translation>Form1</translation>
     </message>
     <message>
         <source>TextLabel1</source>
         <translation>TextLabel1</translation>
     </message>
     <message>
         <source>Snooze</source>
         <translation>Schlummern</translation>
     </message>
     <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>
         <translation>Mit</translation>
     </message>
     <message>
         <source>Thu</source>
         <comment>Thursday</comment>
         <translation>Do</translation>
     </message>
     <message>
         <source>Fri</source>
         <comment>Friday</comment>
         <translation>Fr</translation>
     </message>
     <message>
         <source>Sat</source>
         <comment>Saturday</comment>
         <translation>Sam</translation>
     </message>
     <message>
         <source>Sun</source>
         <comment>Sunday</comment>
         <translation>Son</translation>
     </message>
     <message>
         <source>Lap/Split</source>
         <translation>Rundenzeit</translation>
     </message>
     <message>
         <source>&lt;b&gt;Daily Alarm:&lt;/b&gt;&lt;p&gt;</source>
         <translation>&lt;b&gt;Tages-Alarm:&lt;/b&gt;&lt;p&gt;</translation>
     </message>
     <message>
         <source>Select Day</source>
         <translation>Tag wählen</translation>
     </message>
     <message>
         <source>Daily alarm requires at least
 one day to be selected.</source>
         <translation>Tagesalarm erfordert zumindest
 einen ausgewählten Tag.</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
 </context>
 <context>
     <name>ClockBase</name>
     <message>
         <source>Clock</source>
         <translation>Uhr</translation>
     </message>
     <message>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
         <source>Stopwatch</source>
         <translation>Stoppuhr</translation>
     </message>
     <message>
         <source>Split</source>
         <translation>Zwischenzeit</translation>
     </message>
     <message>
         <source>Lap</source>
         <translation>Rundenzeit</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Start</translation>
     </message>
     <message>
         <source>Starts and stops the stopwatch.</source>
         <translation>Startet und stopp die Uhr.</translation>
     </message>
     <message>
         <source>Lap/Split</source>
         <translation>Runden/Zwischenzeit</translation>
     </message>
     <message>
         <source>Resets the stopwatch.</source>
         <translation>Setzt die Uhr zurück.</translation>
     </message>
     <message>
         <source>Alarm</source>
         <translation>Alarm</translation>
     </message>
     <message>
         <source>Daily Alarm</source>
         <translation>Tagesalarm</translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation>Aktiviert</translation>
     </message>
     <message>
         <source>Check to enable the daily alarm</source>
         <translation>Auswählen um den Tagesalarm zu aktivieren</translation>
     </message>
     <message>
         <source>Set the hour the alarm will sound.</source>
         <translation>Stunde setzen an der der Alarm ertönt.</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Set the minute the alarm will sound.</source>
         <translation>Minute setzen, an der der Alarm ertönt.</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>Days:</source>
         <translation>Tage: </translation>
     </message>
     <message>
         <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
@@ -1,862 +1,831 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation>Kalender</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>Heute</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Tag</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Woche</translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation>7 Tage</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Monat</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation>Der Termin dauert unter Umständen
 länger als die Wiederholungsinterval.</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Kann Daten zur Zeit nicht editieren, synchronisiere gerade</translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation>Ereignis editieren</translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation>Minuten)</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Kein Speicherplatz</translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation>Kalender war nicht in der Lage,
 Ihre Änderungen zu speichern.
 Bitte machen Sie etwas Speicherplatz
 frei.
 Trozdem beenden?</translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation>(Unbekannt)</translation>
     </message>
     <message>
         <source>Error!</source>
         <translation>Fehler!</translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation>Beheben</translation>
     </message>
     <message>
         <source>Continue</source>
         <translation>Weiter</translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation>Termin duplizieren</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>Editieren...</translation>
     </message>
     <message>
         <source>error box</source>
         <translation>Fehlerbox</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation>M</translation>
     </message>
     <message>
         <source>T</source>
         <translation>D</translation>
     </message>
     <message>
         <source>W</source>
         <translation>M</translation>
     </message>
     <message>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Montag</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Dienstag</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Mittwoch</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Donnerstag</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Freitag</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Samstag</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Sonntag</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00p</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation>Beginn</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Ende</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editieren</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Senden</translation>
     </message>
     <message>
         <source>This is an all day event.</source>
         <translation>Dieser Eintrag ist ganztägig.</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Zeit</translation>
     </message>
     <message>
         <source> - </source>
         <translation>-</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplizieren</translation>
     </message>
     <message>
         <source>Beam this occurence</source>
         <translation>Dieses Vorkommen Senden</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation>:00 PM</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation>:00 AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Kalender</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>Voreinstellungen</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation>Erster anzuzeigender Termin</translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation>Startzeit:</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation>Alarmeinstellungen</translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation>Alarmvorwarnzeit</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>Minuten</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Unterschiedliches</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>Spaltenstil:</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Standard</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Medium</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Groß</translation>
     </message>
     <message>
         <source>Views</source>
         <translation>Ansichten</translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation>Defaultansicht:</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Tag</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Woche</translation>
     </message>
     <message>
         <source>Week List</source>
         <translation>Wochenliste</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Monat</translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation>Sprung zu &quot;jetzt&quot;</translation>
     </message>
     <message>
         <source>Time display</source>
         <translation>Zeitanzeige</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nie</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Beginn</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation>Beginn-Ende</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Voreinstellung</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Ort:</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Büro</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>zu Hause</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorie:</translation>
     </message>
+    <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>
         <translation>W</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00.Jan-00.Jan</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
         <translation>MDMDFSSM</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstEvent</name>
     <message>
         <source>Edit</source>
         <translation>Editieren</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplizieren</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Senden</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>W</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>W: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation>P</translation>
     </message>
-    <message>
-        <source>Mo</source>
-        <comment>Monday</comment>
-        <translation type="obsolete">Mo</translation>
-    </message>
-    <message>
-        <source>Tu</source>
-        <comment>Tuesday</comment>
-        <translation type="obsolete">Di</translation>
-    </message>
-    <message>
-        <source>We</source>
-        <comment>Wednesday</comment>
-        <translation type="obsolete">Mi</translation>
-    </message>
-    <message>
-        <source>Th</source>
-        <comment>Thursday</comment>
-        <translation type="obsolete">Do</translation>
-    </message>
-    <message>
-        <source>Fr</source>
-        <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>
         <source>Daily...</source>
         <translation>Täglich...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>Wöchentlich...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>Monatlich...</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>Jährlich...</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Keine Wiederholung...</translation>
     </message>
     <message>
         <source>Start Time</source>
         <translation>Startzeit</translation>
     </message>
     <message>
         <source>End Time</source>
         <translation>endet um</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>Neues Ereignis</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Ort</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Treffen</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Mittagessen</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Abendessen</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Reise</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Büro</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>zu Hause</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>Jan 02 00</translation>
     </message>
     <message>
         <source>Start time</source>
         <translation>Startzeit</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Ganztägig</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Zeitzone</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Alarm</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>Minuten</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Still</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Laut</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Wiederholung</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Keine Wiederholung...</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Bescheibung</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>Start - Ende</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Notizen...</translation>
     </message>
-    <message>
-        <source>Start Time</source>
-        <translation type="obsolete">Startzeit</translation>
-    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Notiz bearbeiten</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Mittagessen</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Beginn</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Ende</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>Den %1. %2. in jedem </translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>Am %1. jeden </translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>Den %1. %1. jeden</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Jeden</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Montag</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Dienstag</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Mittwoch</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Donnerstag</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Freitag</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Samstag</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Sonntag</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>.</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>.</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>.</translation>
     </message>
     <message>
         <source>th</source>
         <translation>.</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation>Keine Wiederholung</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>Tag(e)</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>Woche(n)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Wiederholung</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Tag</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>Monat(e)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>Jahr(e)</translation>
     </message>
     <message>
         <source>days</source>
         <translation>Tage</translation>
     </message>
     <message>
         <source>day</source>
         <translation>Tag</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>Wochen</translation>
     </message>
     <message>
         <source>week</source>
         <translation>Woche</translation>
     </message>
     <message>
         <source>month</source>
         <translation>Monat</translation>
     </message>
     <message>
         <source>year</source>
         <translation>Jahr</translation>
     </message>
     <message>
         <source> and </source>
         <translation>und</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
 und</translation>
     </message>
     <message>
         <source>, and </source>
         <translation>,
 und</translation>
     </message>
     <message>
         <source>on </source>
         <translation>am</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Zu wiederholendes Ereignis</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nie</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Tag</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Woche</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Monat</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Jahr</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Jeden</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Häufigkeit</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Endet am:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Kein Enddatum</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Wiederholen am</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Mo</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Di</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Mi</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Do</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Fr</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sa</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>So</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Jeden</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>WochenVar</translation>
     </message>
     <message>
         <source>months</source>
         <translation>Monate</translation>
     </message>
     <message>
         <source>years</source>
         <translation>Jahre</translation>
     </message>
 </context>
 </TS>
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,316 +1,252 @@
 <!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>
         <source>Tab</source>
         <translation>Tabulator</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Hoch</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Runter</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Einfügen</translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation>Befehlsliste anzeigen</translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation>Befehlsliste verbergen</translation>
     </message>
     <message>
-        <source>Tabs on Bottom</source>
-        <translation 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>
         <source>Cyan on White</source>
         <translation>Cyan auf Weiß</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>Weiß auf Cyan</translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation>Blau auf Schwaru</translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation>Bernstein auf Schwarz</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Farben</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Schnelles Editieren</translation>
     </message>
     <message>
-        <source>Edit</source>
-        <translation 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>
         <source>ScrollBar</source>
         <translation>Laufleiste</translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation>Befehlsleiste anzeigen</translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation>Befehlsliste verstecken</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation>Benutzerdefiniert</translation>
     </message>
     <message>
         <source>Command List</source>
         <translation>Befehlsliste</translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation>Zeilenumbruch</translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation>Töne benutzen</translation>
     </message>
     <message>
-        <source>Tabs on Top</source>
-        <translation 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>
         <source>Hidden</source>
         <translation>Versteckt
 </translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation></translation>
     </message>
     <message>
         <source>Black on Pink</source>
         <translation>Schwarz auf Pink</translation>
     </message>
     <message>
         <source>Pink on Black</source>
         <translation>Pink auf Scwarz</translation>
     </message>
     <message>
         <source>default</source>
         <translation>Vorgabe</translation>
     </message>
     <message>
         <source>new session</source>
         <translation>Neue Sitzung</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ansicht</translation>
     </message>
     <message>
         <source>Fonts</source>
         <translation>Schrift</translation>
     </message>
     <message>
         <source>Sessions</source>
         <translation>Sitzung</translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation>Vollbild</translation>
     </message>
     <message>
         <source>Zoom</source>
         <translation></translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>Editieren...</translation>
     </message>
     <message>
         <source>History...</source>
         <translation>History...</translation>
     </message>
     <message>
         <source>To exit fullscreen, tap here.</source>
         <translation>Hier clicken für die normale Ansicht.</translation>
     </message>
     <message>
         <source>History Lines:</source>
         <translation>History Zeilen:</translation>
     </message>
     <message>
         <source>Konsole </source>
         <translation></translation>
     </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Befehlsauswahl</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation>Befehl hinzufügen</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation>Geben Sie den Befehl ein,
 den Sie hinzufügen wollen.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/fifteen.ts b/i18n/de/fifteen.ts
index 076f51f..abaf35b 100644
--- a/i18n/de/fifteen.ts
+++ b/i18n/de/fifteen.ts
@@ -1,100 +1,96 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FifteenConfigDialog</name>
     <message>
         <source>All Images</source>
         <translation>Alle Bilder</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation>Alle Dateien</translation>
     </message>
     <message>
         <source>Select board background</source>
         <translation>Wähle Bretthintergrund</translation>
     </message>
 </context>
 <context>
     <name>FifteenConfigDialogBase</name>
     <message>
         <source>Configure Fifteen</source>
         <translation>Fünfzehn konfigurieren</translation>
     </message>
     <message>
         <source>Use a Custom Image</source>
         <translation>Ein eigenes Bild nutzen</translation>
     </message>
     <message>
         <source>Custom Image</source>
         <translation>Eigenes Bild</translation>
     </message>
     <message>
         <source>&lt;b&gt;Path:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Pfad:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
         <source>&lt;b&gt;Preview:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Vorschau:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Grid</source>
         <translation>Gitter</translation>
     </message>
     <message>
         <source>&lt;b&gt;Rows:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Reihen:&lt;/b&gt;</translation>
     </message>
     <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>
 <context>
     <name>PiecesTable</name>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Fünfzehn</translation>
     </message>
     <message>
         <source>Congratulations!
 You win the game!</source>
         <translation>Herzlichen Glückwunsch!
 Sie haben gewonnen!</translation>
     </message>
     <message>
         <source>R&amp;andomize Pieces</source>
         <translation>&amp;Verwirbeln</translation>
     </message>
     <message>
         <source>&amp;Reset Pieces</source>
         <translation>&amp;Teile zurücksetzen</translation>
     </message>
 </context>
 </TS>
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
@@ -1,215 +1,177 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FormatterApp</name>
     <message>
         <source>Formatter</source>
         <translation>Formatierer</translation>
     </message>
     <message>
         <source>Storage Type</source>
         <translation>Medientyp</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <source>Ok</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Formatter Output</source>
         <translation>Formatierungsausgabe</translation>
     </message>
     <message>
         <source>Trying to umount.</source>
         <translation>Versuche unzumounten</translation>
     </message>
     <message>
         <source>umount failed!</source>
         <translation>Unmounten fehlgeschlagen !</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
         <source>Could not umount.
 Device is busy!</source>
         <translation>Unmounten fehlgeschlagen !
 Gerät ist in Benutzung.</translation>
     </message>
     <message>
         <source>Trying to format.</source>
         <translation>Formatierungsversuch.</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>
     </message>
     <message>
         <source>CAUTION:
 Changing parameters on this
 page may cause your system
 to stop functioning properly!</source>
         <translation>ACHTUNG:
 Das Ändern von Parametern auf 
 dieser Seite kann die Funktionalität
 des Systems beeinträchtigen!</translation>
     </message>
     <message>
         <source>Format?</source>
         <translation>Formatieren?</translation>
     </message>
     <message>
         <source>
 with %1 filesystem?
 You will loose all data!!</source>
         <translation>mit Dateisystem %1?
 Alle Daten gehen verloren!</translation>
     </message>
     <message>
         <source>Trying to umount %1.</source>
         <translation>%1 wird ausgebunden.</translation>
     </message>
     <message>
         <source>Trying to mount %1.</source>
         <translation>%1 wird eingebunden.</translation>
     </message>
     <message>
         <source>%1
 has been successfully mounted.</source>
         <translation>%1 wurde erfolgreich eingebunden.</translation>
     </message>
     <message>
         <source>Storage Type: %1</source>
         <translation>Speichertyp: %1</translation>
     </message>
     <message>
         <source>Type: %1
 Formatted with %2
 %3, %4, %5</source>
         <translation>Typ: %1
 Formatiert mit %2
 %3, %4, %5</translation>
     </message>
 </context>
 </TS>
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
@@ -1,56 +1,52 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GoMainWidget</name>
     <message>
         <source>New Game</source>
         <translation>Neues Spiel</translation>
     </message>
     <message>
         <source>Pass</source>
         <translation>Passe</translation>
     </message>
     <message>
         <source>Resign</source>
         <translation>Aufgeben</translation>
     </message>
     <message>
         <source>Two player option</source>
         <translation>2-Spieler-Option</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Spiel</translation>
     </message>
 </context>
 <context>
     <name>GoWidget</name>
     <message>
         <source>White %1, Black %2. </source>
         <translation>Weiß %1, Schwarz %2.</translation>
     </message>
     <message>
         <source>White wins.</source>
         <translation>Weiß gewinnt.</translation>
     </message>
     <message>
         <source>Black wins.</source>
         <translation>Schwarz gewinnt.</translation>
     </message>
     <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
@@ -1,454 +1,462 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Edit_Title</name>
     <message>
         <source>Edit Title</source>
         <translation>Titel bearbeiten</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
         <source>Apply</source>
         <translation>Anwenden</translation>
     </message>
 </context>
 <context>
     <name>FontDialog</name>
     <message>
         <source>Font Dialog</source>
         <translation>Font Dialog</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation>Der kleine braune Fuchs springt über den faulen Hund</translation>
     </message>
 </context>
 <context>
     <name>Gutenbrowser</name>
     <message>
         <source>Running wget</source>
         <translation>Führe wget aus</translation>
     </message>
     <message>
         <source>Download Library Index, or FTP sites?</source>
         <translation>Lade Bibliothek Index oder FTP Seite?</translation>
     </message>
     <message>
         <source>Do you want to download the newest
 Project Gutenberg Library Index?
 or select an ftp site?
 </source>
         <translation>Möchten Sie die neuesten
 Projekt Gutenberg Bibliotheken Index herunterladen?
 Oder eine FTP Seite wählen?
 </translation>
     </message>
     <message>
         <source>&amp;Library Index</source>
         <translation>&amp;Bibliotheken Index</translation>
     </message>
     <message>
         <source>&amp;Ftp Site</source>
         <translation>&amp;FTP Seite</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Abbrechen</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Notiz</translation>
     </message>
     <message>
         <source>Etext Search</source>
         <translation>Etext Suche</translation>
     </message>
     <message>
         <source>Please install unzip</source>
         <translation>Bitte installieren sie unzip</translation>
     </message>
     <message>
         <source>Gutenberg Library</source>
         <translation>Gutenberg Bibliothek</translation>
     </message>
     <message>
         <source>Gutenbrowser</source>
         <translation>Gutenbrowser</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Öffnen</translation>
     </message>
     <message>
         <source>Search google.com</source>
         <translation>Suche auf google.com</translation>
     </message>
     <message>
         <source>Edit Title</source>
         <translation>Titel bearbeiten</translation>
     </message>
     <message>
         <source>Please install unzip in your PATH</source>
         <translation>Bitte installieren sie unzip in Ihrem PATH</translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation>Lade Gutenberg Index herunter...</translation>
     </message>
 </context>
 <context>
     <name>HelpMe</name>
     <message>
         <source>Based on gutenbook.pl, available from http://www.gutenbook.org</source>
         <translation>Basierend auf gutenbook.pl, verfügbar von http://www.gutenbook.org</translation>
     </message>
     <message>
         <source>Much appreciation to Lee Burgess,</source>
         <translation>Viel Anerkennung an Lee Burgess,</translation>
     </message>
     <message>
         <source>for the original idea and concept of gutenbook.
 </source>
         <translation>für die originale Idee und das Konzept von gutenbook.
 </translation>
     </message>
     <message>
         <source>A list of current Gutenberg ftp sites is at http://promo.net/pg/index.html
 </source>
         <translation>Eine Liste von aktuellen Gutenberg FTP Seiten ist auf http://promo.net/pg/index.hmtl
 </translation>
     </message>
     <message>
         <source>For bug reports, comments or questions about Gutenbrowser, email</source>
         <translation>Für Fehlermeldungen, Kommentare oder Fragen über Gutenbrowser schicken Sie einen EMail an</translation>
     </message>
     <message>
         <source>ljp@llornkcor.com
 </source>
         <translation>ljp@llornkcor.com
 </translation>
     </message>
     <message>
         <source>
 Made using Qt, Qt Embedded, and Qtopia, a cross platform development API
 http://www.trolltech.com
 
 </source>
         <translation>Erstellt mit Qt, Qt Embedded und Qtopia, eine Plattformübergreifende Entwicklungs API
 http://www.trolltech.com
 
 </translation>
     </message>
     <message>
         <source>Arnold&apos;s Laws of Documentation:</source>
         <translation>Arnolds Gesetz der Dokumentation:</translation>
     </message>
     <message>
         <source>(1) If it should exist, it doesn&apos;t.</source>
         <translation>(1) Wenn es existieren sollte, existiert es nicht.</translation>
     </message>
     <message>
         <source>(2) If it does exist, it&apos;s out of date.</source>
         <translation>(2) Wenn es existiert, ist es veraltet.</translation>
     </message>
     <message>
         <source>(3) Only documentation for</source>
         <translation>(3) Nur Dokumentation für</translation>
     </message>
     <message>
         <source>useless programs transcends the</source>
         <translation>unnützte Programme übersteigen die</translation>
     </message>
     <message>
         <source>first two laws.
 </source>
         <translation>ersten 2 Gesetze.
 </translation>
     </message>
     <message>
         <source>Everything is temporary, anyway....
  :o)</source>
         <translation>Alles ist temporär, immerhin...
 :o)</translation>
     </message>
 </context>
 <context>
     <name>HelpWindow</name>
     <message>
         <source>&amp;Open File</source>
         <translation>&amp;Datei öffnen</translation>
     </message>
     <message>
         <source>&amp;Close</source>
         <translation>&amp;Schließen</translation>
     </message>
     <message>
         <source>&amp;Backward</source>
         <translation>&amp;Rückwärts</translation>
     </message>
     <message>
         <source>&amp;Forward</source>
         <translation>&amp;Vorwärts</translation>
     </message>
     <message>
         <source>&amp;Home</source>
         <translation>&amp;Anfang</translation>
     </message>
     <message>
         <source>Add Bookmark</source>
         <translation>Füge Lesezeichen hinzu</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;Go</source>
         <translation>&amp;Gehe</translation>
     </message>
     <message>
         <source>History</source>
         <translation>Verlauf</translation>
     </message>
     <message>
         <source>Bookmarks</source>
         <translation>Lesezeichen</translation>
     </message>
     <message>
         <source>Backward</source>
         <translation>Rückwärts</translation>
     </message>
     <message>
         <source>Forward</source>
         <translation>Vorwärts</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Anfang</translation>
     </message>
 </context>
 <context>
     <name>LibraryDialog</name>
     <message>
         <source>Library Index - using master pg index.</source>
         <translation>Bibliothek Index - Master pg verwenden.</translation>
     </message>
     <message>
         <source>Library Search</source>
         <translation>Bibliotheken Suche</translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation>Lade Gutenberg Index herunter...</translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation>Führe wget aus</translation>
     </message>
     <message>
         <source>Title</source>
         <translation>Titel</translation>
     </message>
     <message>
         <source>Author</source>
         <translation>Author</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Jahr</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>A-F</source>
         <translation>A-F</translation>
     </message>
     <message>
         <source>G-M</source>
         <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>Options</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
         <source>Open Automatically</source>
         <translation>Automatisch öffnen</translation>
     </message>
     <message>
         <source>Last name first 
 (requires library restart)</source>
         <translation>Letzter Name zuerst 
 (benötigt neustart der Bibliothek)
 </translation>
     </message>
     <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>
         <source>&amp;Cancel</source>
         <translation>&amp;Abbrechen</translation>
     </message>
 </context>
 <context>
     <name>OpenEtext</name>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Text</translation>
     </message>
     <message>
         <source>Remove Etext</source>
         <translation>Text löschen</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Abbrechen</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Sea&amp;rch</source>
         <translation>Su&amp;che</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Abbrechen</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Kontext Sensitiv</translation>
     </message>
 </context>
 <context>
     <name>SearchResultsDlg</name>
     <message>
         <source>Search Results</source>
         <translation>Suchergebnisse</translation>
     </message>
     <message>
         <source>&amp;Download</source>
         <translation>&amp;Runterladen</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Abbrechen</translation>
     </message>
 </context>
 <context>
     <name>optionsDialog</name>
     <message>
         <source>Opera</source>
         <translation>Opera</translation>
     </message>
     <message>
         <source>Konqueror</source>
         <translation>Konqueror</translation>
     </message>
     <message>
         <source>wget</source>
         <translation>wget</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Text</translation>
     </message>
     <message>
         <source>Downloading ftp sites....</source>
         <translation>Lade ftp Seiten runter ...</translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation>Führe wget aus</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Notiz</translation>
     </message>
     <message>
         <source>ftpSiteDlg</source>
         <translation></translation>
     </message>
     <message>
         <source>List File not opened sucessfully.</source>
         <translation>Listendatei konnte nicht geöffnet werden.</translation>
     </message>
     <message>
         <source>File not opened sucessfully.</source>
         <translation>Datei konnte nicht geöffnet werden.</translation>
     </message>
     <message>
         <source>Main</source>
         <translation>Haupt</translation>
     </message>
     <message>
         <source>FTP</source>
         <translation>FTP</translation>
     </message>
     <message>
         <source>http://sailor.gutenberg.org</source>
         <translation>http://sailor.gutenberg.org</translation>
     </message>
     <message>
         <source>http://www.prairienet.org/pg</source>
         <translation>http://www.prairienet.org/pg</translation>
     </message>
     <message>
         <source>HTTP</source>
         <translation>HTTP</translation>
     </message>
     <message>
         <source>Gutenbrowser Options</source>
         <translation>Gutenbrowser Einstellungen</translation>
     </message>
 </context>
 </TS>
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
@@ -1,68 +1,64 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KBill</name>
     <message>
         <source>kBill</source>
         <translation>kBill</translation>
     </message>
     <message>
         <source>New game</source>
         <translation>Neues Spiel</translation>
     </message>
     <message>
         <source>Pause game</source>
         <translation>Spiel anhalten</translation>
     </message>
     <message>
         <source>Story of kBill</source>
         <translation>Geschichte v. kBill</translation>
     </message>
     <message>
         <source>Rules</source>
         <translation>Regeln</translation>
     </message>
     <message>
         <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>
         <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 disguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</source>
         <translation>&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, nur durch seinen Spitznamen &quot;Bill&quot; bekannt, hat den ultimativen Computervirus entwickelt.  Ein so starker Virus, daß er einen gewöhnlichen Computer in einen Toaströster verwandeln kann.  (Oooh!) &quot;Bill&quot; hat sich selbst gecloned in Milliarden Zillionen Mikro-Bills.  Ihr einziger Zweck ist es, den infamen Virus, der geschickt als beliebtes Betriebssystem getarnt ist, zu verbreiten. Als Systemadministrator und Kammerjäger ist es Dein Job, Bill an der Erfüllung seiner Aufgabe zu hindern.</translation>
     </message>
 </context>
 <context>
     <name>UI</name>
     <message>
         <source>After Level</source>
         <translation>Nach Level </translation>
     </message>
     <message>
         <source>Your score</source>
         <translation>Ihr Punktestand </translation>
     </message>
 </context>
 </TS>
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
@@ -1,295 +1,291 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KRFBConnection</name>
     <message>
         <source>Connected</source>
         <translation>Verbunden</translation>
     </message>
     <message>
         <source>Connection Refused</source>
         <translation>Verbindung verweigert</translation>
     </message>
     <message>
         <source>Host not found</source>
         <translation>Rechner nicht gefunden</translation>
     </message>
     <message>
         <source>Read Error: QSocket reported an error reading
 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>
         <source>Protocol Error: An unknown encoding was used by the server %1</source>
         <translation>Protokollfehler: Es wurde eine unbekannte Kodierung von Server %1 verwendet</translation>
     </message>
     <message>
         <source>Waiting for server initialization...</source>
         <translation>Warte auf Server-Initialisierung...</translation>
     </message>
 </context>
 <context>
     <name>KRFBLogin</name>
     <message>
         <source>Waiting for server version...</source>
         <translation>Warten auf die Server-Version...</translation>
     </message>
     <message>
         <source>Error: Invalid server version, %1</source>
         <translation>Fehler: Ungültige Serverversion %1</translation>
     </message>
     <message>
         <source>Error: Unsupported server version, %1</source>
         <translation>Fehler: Nicht unterstützte Serverversion %1</translation>
     </message>
     <message>
         <source>Logged in</source>
         <translation>Angemeldet</translation>
     </message>
     <message>
         <source>Error: This server requires a password, but none has been specified.
 </source>
         <translation>Fehler: Dieser Server erwartet ein Passwort, es wurde aber keines angegeben.
 </translation>
     </message>
     <message>
         <source>Error: The password you specified was incorrect.</source>
         <translation>Fehler: Das angegebene Passwort war nicht korrekt.</translation>
     </message>
     <message>
         <source>Error: Too many invalid login attempts have been made
 to this account, please try later.</source>
         <translation>Fehler: Zuviele ungültige Anmeldeversuche wurden für diesen Zugang durchgeführt.
 Bitte versuchen Sie es es später noch einmal.</translation>
     </message>
     <message>
         <source>Login Failed</source>
         <translation>Anmeldung fehlgeschlagen</translation>
     </message>
     <message>
         <source>Too many failures</source>
         <translation>Zu viele Fehlversuche</translation>
     </message>
 </context>
 <context>
     <name>KVNC</name>
     <message>
         <source>VNC Viewer</source>
         <translation>VNC Anzeiger</translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation>Vollbild</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>Auflegen</translation>
     </message>
     <message>
         <source>Stop Full Screen</source>
         <translation>Vollbild beenden</translation>
     </message>
     <message>
         <source>Connected to remote host</source>
         <translation>Verbunden mit Rechner</translation>
     </message>
     <message>
         <source>Logged in to remote host</source>
         <translation>Mit Rechner verbunden</translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation>Verbindung schließen</translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation>Neue Verbindung</translation>
     </message>
     <message>
         <source>Open Bookmark</source>
         <translation>Bookmark öffnen</translation>
     </message>
     <message>
         <source>Delete Bookmark</source>
         <translation>Bookmark löschen</translation>
     </message>
     <message>
         <source>Send Contrl-Alt-Delete</source>
         <translation>Ctrl-Alt-Entf. senden</translation>
     </message>
     <message>
         <source>Next Click is Double Click</source>
         <translation>Nächster Klick ist Doppel-Klick</translation>
     </message>
     <message>
         <source>Next Click is Right Click</source>
         <translation>Nächster Klick ist Rechts-Klick</translation>
     </message>
 </context>
 <context>
     <name>KVNCBookmarkDlgBase</name>
     <message>
         <source>Bookmarks</source>
         <translation>Bookmarks</translation>
     </message>
     <message>
         <source>Choose a bookmark that you would like to open</source>
         <translation>Wählen Sie ein Bookmark dass Sie gerne öffnen möchten</translation>
     </message>
 </context>
 <context>
     <name>KVNCConnDlgBase</name>
     <message>
         <source>VNC Viewer Connection</source>
         <translation>VNC Verbindung</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
         <source>Show Password</source>
         <translation>Passwort anzeigen</translation>
     </message>
     <message>
         <source>Password:</source>
         <translation>Passwort: </translation>
     </message>
     <message>
         <source>Bookmark Name:</source>
         <translation>Bookmarkname:</translation>
     </message>
     <message>
         <source>Host Name:</source>
         <translation>Rechnername: </translation>
     </message>
     <message>
         <source>Display Number:</source>
         <translation>Displaynummer: </translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Optionen</translation>
     </message>
     <message>
         <source>Check for screen updates every:</source>
         <translation>Auf Bildschirmaktualisierung testen alle: </translation>
     </message>
     <message>
         <source>Milliseconds</source>
         <translation>Millisekunden</translation>
     </message>
     <message>
         <source>Request 8-bit session</source>
         <translation>8bit-Sitzung anfordern</translation>
     </message>
     <message>
         <source>Raise on bell</source>
         <translation>Bei Signal vergrößern</translation>
     </message>
     <message>
         <source>Request shared session</source>
         <translation>Geteilte Sitzung anfordern</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>Scale Factor</source>
         <translation>Skalierungsfaktor</translation>
     </message>
     <message>
         <source>Encodings</source>
         <translation>Kodierung</translation>
     </message>
     <message>
         <source>Hextile encoding</source>
         <translation>Hextile-Kodierung</translation>
     </message>
     <message>
         <source>CoRRE encoding</source>
         <translation>CoRRe-Kodierung</translation>
     </message>
     <message>
         <source>RRE encoding</source>
         <translation>RRE-Kodierung</translation>
     </message>
     <message>
         <source>Copy rectangle encoding</source>
         <translation>&quot;Copy rectangle&quot;-Kodierung</translation>
     </message>
     <message>
         <source>The password of the VNC server</source>
         <translation>Password des VNC-Servers</translation>
     </message>
     <message>
         <source>Toggle obscuring the password</source>
         <translation>Passwort verschleiern</translation>
     </message>
     <message>
         <source>The name of the VNC server</source>
         <translation>Name des VNC-Servers</translation>
     </message>
     <message>
         <source>The host name of the VNC server</source>
         <translation>Rechnername des VNC-Servers</translation>
     </message>
     <message>
         <source>The display number of the VNC server</source>
         <translation>Displaynumemr des VNC-Servers</translation>
     </message>
     <message>
         <source>Delay between requesting updates from the server</source>
         <translation>Verzögerung zwischen den Aktualisierungsanforderungen vom Server</translation>
     </message>
     <message>
         <source>Request that the VNC server transfer 8 bit color</source>
         <translation>Anforderung für 8bit Farb-Transfer des VNC-Servers</translation>
     </message>
     <message>
         <source>Allow other users to connect to the VNC server</source>
         <translation>Erlaube anderen Anwendern auf den VNC-Server zu verbinden</translation>
     </message>
     <message>
         <source>Scale the remote display to fit on the PDA (Slow)</source>
         <translation>Skalierung der Anzeige so dass sie auf den PDA passt (langsamere Darstellung)</translation>
     </message>
     <message>
         <source>Enable transmiting identical rectangles as references to existing data</source>
         <translation>Ermöglichung der Übertragung identischer Rechtecke als Referenzen auf exisitierende Daten</translation>
     </message>
 </context>
 </TS>
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
@@ -1,291 +1,279 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>DocTabSettings</name>
     <message>
         <source>Enable the Documents Tab</source>
         <translation>Documents tab aktivieren</translation>
     </message>
     <message>
         <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
         <translation>&lt;b&gt;Hinweis:&lt;/b&gt; Das Ändern dieses Settings macht unter Umstand einen Opie-Neustart notwendig.</translation>
     </message>
     <message>
         <source>Check, if you want the Documents Tab to be visible.</source>
         <translation>Anwählen, um den Dokumentenreiter sichtbar zu machen.</translation>
     </message>
 </context>
 <context>
     <name>InputMethodSettings</name>
     <message>
         <source>Resize application on Popup</source>
         <translation>Größenänderung bei Erscheinen der Anwendung </translation>
     </message>
     <message>
         <source>Enable floating and resizing</source>
         <translation>Floating und Größenänderung aktivieren</translation>
     </message>
     <message>
         <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
         <translation>&lt;b&gt;Hinweis:&lt;/b&gt; Das Ändern dieses Settings macht unter Umstand einen Opie-Neustart notwendig.</translation>
     </message>
     <message>
         <source>Check, if you want the application to be automatically resized if the input method pops up.</source>
         <translation>Wählen Sie, ob die Anwendung eine Größenanpassung vornimmt, wenn die Eingabemethode erscheint.</translation>
     </message>
     <message>
         <source>Check, if you want to move and/or resize input methods</source>
         <translation>Wählen Sie, ob Sie Eingabemethoden verschieben oder größenverändern möchten</translation>
     </message>
     <message>
         <source>Specify the percentage of the screen width for the input method</source>
         <translation>Geben Sie die prozentuale Bildschirmbreite für den Eingabebereich an</translation>
     </message>
 </context>
 <context>
     <name>LauncherSettings</name>
     <message>
         <source>Launcher Settings</source>
         <translation>Launchereinstellungen</translation>
     </message>
     <message>
         <source>Taskbar</source>
         <translation>Taskbar</translation>
     </message>
     <message>
         <source>O-Menu</source>
         <translation>O-Menü</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Reiter</translation>
     </message>
     <message>
         <source>InputMethods</source>
         <translation>Eingabebereiche</translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation>Dokumentenreiter</translation>
     </message>
 </context>
 <context>
     <name>MenuSettings</name>
     <message>
         <source>Load applets in O-Menu:</source>
         <translation>Lädt Applets im O-Menü:</translation>
     </message>
     <message>
         <source>Show Launcher tabs in O-Menu</source>
         <translation>Zeigt Launcher-Reiter im O-Menü</translation>
     </message>
     <message>
         <source>Check the applets that you want to have included in the O-Menu.</source>
         <translation>Wählen Sie die Applets, die Sie im O-Menü angezeigt haben möchten.</translation>
     </message>
     <message>
         <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
         <translation>Fügt die Inhalte der Launcher-Reiter als Menüs in das O-Menü ein.</translation>
     </message>
     <message>
-        <source>Show Applications in subpopups</source>
-        <translation type="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>
         <translation>Beispiel 2</translation>
     </message>
     <message>
         <source>Sample 3</source>
         <translation>Beispiel 3</translation>
     </message>
 </context>
 <context>
     <name>TabDialog</name>
     <message>
         <source>Edit Tab</source>
         <translation>Reiter bearbeiten</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>Hintergrund</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
         <source>Icons</source>
         <translation>Symbole</translation>
     </message>
     <message>
         <source>Previewing %1</source>
         <translation>Vorschau %1</translation>
     </message>
     <message>
         <source>This is a rough preview of what the currently selected Tab will look like.</source>
         <translation>Dies ist eine grobe Vorschau wie der gewählte Reiter aussehen wird.</translation>
     </message>
     <message>
         <source>Use a custom font</source>
         <translation>Benutzerdefinierte Schrift</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Typ:</translation>
     </message>
     <message>
         <source>Ruled</source>
         <translation>Ruled</translation>
     </message>
     <message>
         <source>Solid color</source>
         <translation>Einfarbig</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Bild</translation>
     </message>
     <message>
         <source>Select...</source>
         <translation>Auswählen...</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Voreinstellung</translation>
     </message>
     <message>
         <source>Size:</source>
         <translation>Größe:</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Klein</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Groß</translation>
     </message>
     <message>
         <source>Color:</source>
         <translation>Farbe: </translation>
     </message>
     <message>
         <source>Columns:</source>
         <translation>Spalten:</translation>
     </message>
     <message>
         <source>Automatic</source>
         <translation>Automatisch</translation>
     </message>
 </context>
 <context>
     <name>TabsSettings</name>
     <message>
         <source>Launcher Tabs:</source>
         <translation>Launcher-Reiter: </translation>
     </message>
     <message>
         <source>foobar</source>
         <translation>Werkzeugleiste</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Bearbeiten</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>LÖschen</translation>
     </message>
     <message>
         <source>Enable big busy indicator</source>
         <translation>Großen &quot;Busy Indicator&quot; aktivieren</translation>
     </message>
     <message>
-        <source>Enable blinking busy indicator</source>
-        <translation 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>
         <source>Not implemented yet</source>
         <translation>Noch nicht implementiert</translation>
     </message>
     <message>
         <source>Enable animated busy indicator</source>
         <translation>Animierten Busyzeiger anwählen</translation>
     </message>
     <message>
         <source>Activate this, if you want an animatedbusy indicator for starting applications in the Launcher.</source>
         <translation>Aktivieren Sie diese Einstellung, wenn Sie einen animierten Busy-Zeiger im Launcher sehen möchten.</translation>
     </message>
     <message>
         <source>Enable static background pixmap</source>
         <translation>Statisches Hintergrundbild aktivieren</translation>
     </message>
     <message>
         <source>Activate this, if you want the background pixmap not to scroll with the icons.</source>
         <translation>Aktivieren Sie diese Einstellung, wenn das Hintergrundbild nicht mitscrollen soll.</translation>
     </message>
 </context>
 <context>
     <name>TaskbarSettings</name>
     <message>
         <source>Load applets in Taskbar:</source>
         <translation>Applets in die Taskbar laden:</translation>
     </message>
     <message>
         <source>Check the applets that you want displayed in the Taskbar.</source>
         <translation>Wählen Sie die Applets, die Sie in der Taskbar angezeigt haben möchten.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/libaboutapplet.ts b/i18n/de/libaboutapplet.ts
index aceef6b..1a4a466 100644
--- a/i18n/de/libaboutapplet.ts
+++ b/i18n/de/libaboutapplet.ts
@@ -1,215 +1,87 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <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;
 &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>Authors</source>
         <translation>Autoren</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 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>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;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>&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.2&lt;/b&gt;&lt;/center&gt;</source>
         <translation>&lt;center&gt;&lt;b&gt;Das Open Palmtop Integrated Environment V1.2&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;Alberto &apos;Skyhusker&apos; Garcia Hierro&lt;/b&gt; (skyhusker@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></translation>
     </message>
 </context>
 </TS>
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
@@ -1,116 +1,88 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>BatteryStatus</name>
     <message>
         <source>Failure</source>
         <translation>Fehler</translation>
     </message>
     <message>
         <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>
         <source>Very Low</source>
         <translation>Sehr niedrig</translation>
     </message>
     <message>
         <source>Critical</source>
         <translation>Kritisch</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Unbekannt</translation>
     </message>
     <message>
         <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>
         <source>Remaing Power: %1 %2
 Remaining Time: %3</source>
         <translation>Restliche Energie: %1 %2
 Restliche Zeit: %3</translation>
     </message>
     <message>
         <source>Ipaq  %1</source>
         <translation>iPAQ  %1</translation>
     </message>
 </context>
 </TS>
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,27 +1,17 @@
 <!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>
 </TS>
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,841 +1,779 @@
 <!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>
     </message>
     <message>
         <source>New Account</source>
         <translation>Neuer Zugang</translation>
     </message>
     <message>
         <source>Edit Account: </source>
         <translation>Zugang Bearbeiten: </translation>
     </message>
     <message>
         <source>Dial</source>
         <translation>Wählen</translation>
     </message>
     <message>
         <source>Edit Login Script</source>
         <translation>Login Script editieren</translation>
     </message>
     <message>
         <source>Authentication</source>
         <translation>Authentisierung</translation>
     </message>
     <message>
         <source>IP Setup</source>
         <translation>IP Einstellung</translation>
     </message>
     <message>
         <source>IP</source>
         <translation>IP</translation>
     </message>
     <message>
         <source>Gateway Setup</source>
         <translation>Gateway Setup</translation>
     </message>
     <message>
         <source>Gateway</source>
         <translation>Gateway</translation>
     </message>
     <message>
         <source>DNS Servers</source>
         <translation>DNS Server</translation>
     </message>
     <message>
         <source>DNS</source>
         <translation>DNS</translation>
     </message>
     <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>
         <source>PAP</source>
         <translation>PAP</translation>
     </message>
     <message>
         <source>Terminal-based</source>
         <translation>
 Terminal basiert</translation>
     </message>
     <message>
         <source>CHAP</source>
         <translation>CHAP</translation>
     </message>
     <message>
         <source>PAP/CHAP</source>
         <translation>PAP/CHAP</translation>
     </message>
     <message>
         <source>&lt;p&gt;Specifies the method used to identify yourself to
 the PPP server. Most universities still use
 &lt;b&gt;Terminal&lt;/b&gt;- or &lt;b&gt;Script&lt;/b&gt;-based authentication,
 while most ISP use &lt;b&gt;PAP&lt;/b&gt; and/or &lt;b&gt;CHAP&lt;/b&gt;. If
 unsure, contact your ISP.
 
 If you can choose between PAP and CHAP,
 choose CHAP, because it&apos;s much safer. If you don&apos;t know
 whether PAP or CHAP is right, choose PAP/CHAP.</source>
         <translation>&lt;p&gt;Spezifiziert die Methode die benutzt wird um Sie am
 PPP-Server zu identifizieren. Die meisten Hochschulen nutzen
 nach wie vor &lt;b&gt;Terminal&lt;/b&gt; oder &lt;b&gt;Script&lt;/b&gt; basierte 
 Authentisierung während die meisten ISPs &lt;b&gt;PAP&lt;/b&gt; oder &lt;b&gt;CHAP&lt;/b&gt; 
 verwenden. Wenn Sie unsicher sind fragen Sie Ihren ISP.
 
 Wenn Sie zwischen PAP oder CHAP wählen können nehmen Sie CHAP- 
 es ist sicherer. Wenn Sie nicht wissen ob PAP oder CHAP notwendig ist 
 wählen Sie PAP/CHAP.</translation>
     </message>
     <message>
         <source>Username: </source>
         <translation>Nutzername: </translation>
     </message>
     <message>
         <source>Enter your username here...</source>
         <translation>Geben Sie Ihren Nutzernamen hier ein...</translation>
     </message>
     <message>
         <source>Password: </source>
         <translation>Passwort: </translation>
     </message>
     <message>
         <source>Enter your password here</source>
         <translation>Geben Sie Ihr Passwort hier ein</translation>
     </message>
     <message>
         <source>Store password</source>
         <translation>Passwort speichern</translation>
     </message>
     <message>
         <source>&lt;p&gt;When this is turned on, your ISP password
 will be saved in &lt;i&gt;kppp&lt;/i&gt;&apos;s config file, so
 you do not need to type it in every time.
 
 &lt;b&gt;&lt;font color=&quot;red&quot;&gt;Warning:&lt;/font&gt; your password will be stored as
 plain text in the config file, which is
 readable only to you. Make sure nobody
 gains access to this file!</source>
         <translation>&lt;p&gt;Ist diese Option aktiviert wird Ihr ISP
 Passwort in der Konfiguration gespeichert, so
 dass Sie es nicht mehrmals einbgeben müssen.
 
 &lt;b&gt;&lt;font color=&quot;red&quot;&gt;Warnung:&lt;/font&gt; )Ihr Passwort 
 wird im Klartext in einer Datei gespeichert, welche
 nur von Ihnen lesbar ist. Stellen Sie sicher, dass 
 niemand anders Zugang dazu erhält !
 </translation>
     </message>
     <message>
         <source>error</source>
         <translation>Fehler</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Login script has unbalanced loop Start/End&lt;qt&gt;</source>
         <translation>&lt;qt&gt;Login script hat eine asynchrone Start/Stop-Schleife&lt;/qt&gt;</translation>
     </message>
 </context>
 <context>
     <name>ChooserWidget</name>
     <message>
         <source>&amp;Edit...</source>
         <translation>&amp;Editieren...</translation>
     </message>
     <message>
         <source>&amp;New...</source>
         <translation>&amp;Neu...</translation>
     </message>
     <message>
         <source>Co&amp;py</source>
         <translation>Ko&amp;pieren</translation>
     </message>
     <message>
         <source>De&amp;lete</source>
         <translation>L&amp;öschen</translation>
     </message>
 </context>
 <context>
     <name>DNSWidget</name>
     <message>
         <source>Domain name:</source>
         <translation>Domain Name:</translation>
     </message>
     <message>
         <source>If you enter a domain name here, this domain
 name is used for your computer while you are
 connected. When the connection is closed, the
 original domain name of your computer is
 restored.
 
 If you leave this field blank, no changes are
 made to the domain name.</source>
         <translation>Wenn Sie einen Domainnamen hier angeben
 wird dieser Domainname für Ihren Computer 
 verwendet  während Sie verbunden sind.
 Wird die Verbindung beendet wird der 
 Originalname Ihres Computer wieder eingestellt.
 
 Lassen Sie dieses Feld leer wenn keine Änderung
 Ihres Domainnamens notwendig ist.</translation>
     </message>
     <message>
         <source>Configuration:</source>
         <translation>Konfiguration:</translation>
     </message>
     <message>
         <source>Automatic</source>
         <translation>Automatisch</translation>
     </message>
     <message>
         <source>Manual</source>
         <translation>Manuell</translation>
     </message>
     <message>
         <source>DNS IP address:</source>
         <translation>DNS IP Addresse:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Allows you to specify a new DNS server to be
 used while you are connected. When the
 connection is closed, this DNS entry will be
 removed again.
 
 To add a DNS server, type in the IP address of
 the DNS server here and click on &lt;b&gt;Add&lt;/b&gt;</source>
         <translation>&lt;p&gt;Ermöglicht die Angabe eines DNS-server der
 verwendet wird solange die Verbindung steht. Wird die 
 Verbindung beendet  wird auch der DNS-Eintrag wieder 
 entfernt.
 
 Um einen DNS hinzuzufügen geben Sie eine IP-Adresse
 des DNS an und klicken Sie &lt;b&gt;Hinzu&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Hinzu</translation>
     </message>
     <message>
         <source>Click this button to add the DNS server
 specified in the field above. The entry
 will then be added to the list below</source>
         <translation>Klicken Sie diesen Schalter um den DNS
 aus dem obigen Feld hinzuzufügen.
 Der Eintrag wird zur unteren Liste gefügt</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Entfernen</translation>
     </message>
     <message>
         <source>Click this button to remove the selected DNS
 server entry from the list below</source>
         <translation>Klicken Sie diesen Schalter um den gewählten DNS
 aus der Liste zu entfernen</translation>
     </message>
     <message>
         <source>DNS address list:</source>
         <translation>DNS Adressliste: </translation>
     </message>
     <message>
         <source>&lt;p&gt;This shows all defined DNS servers to use
 while you are connected. Use the &lt;b&gt;Add&lt;/b&gt; and
 &lt;b&gt;Remove&lt;/b&gt; buttons to modify the list</source>
         <translation>&lt;p&gt;Dies zeigt alle definierten DNS die verwendet
 werden während Sie verbunden sind. Benutzen Sie 
 die Schalter &lt;b&gt;Hinzu&lt;/b&gt; und &lt;b&gt;Entfernen&lt;/b&gt; um 
 die Liste zu verändern</translation>
     </message>
     <message>
         <source>Disable DNS servers during connection</source>
         <translation>DNS deaktivieren während einer Verbindung</translation>
     </message>
     <message>
         <source>&lt;p&gt;When this option is selected, all DNS
 servers specified in &lt;tt&gt;/etc/resolv.conf&lt;/tt&gt; are
 temporary disabled while the dialup connection
 is established. After the connection is
 closed, the servers will be re-enabled
 
 Typically, there is no reason to use this
 option, but it may become useful under 
 some circumstances.</source>
         <translation>&lt;p&gt; Ist diese Option aktiviert werden alle
 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>
     </message>
     <message>
         <source>New Device</source>
         <translation>Neues Gerät</translation>
     </message>
     <message>
         <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>
         <translation>Erstellt eine Kopie des gewählten Geräts. Alle
 Einstellungen des selektierten Geräts werden in ein
 neues Gerät kopiert, das modifiziert werden kann</translation>
     </message>
     <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>
         <source>Phone number:</source>
         <translation>Tel. Nummer:</translation>
     </message>
     <message>
         <source>&amp;Add...</source>
         <translation>&amp;Hinzu...</translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation>&amp;Entfernen</translation>
     </message>
     <message>
         <source>&lt;p&gt;Specifies the phone numbers to dial. You
 can supply multiple numbers here, simply
 click on &quot;Add&quot;. You can arrange the
 order the numbers are tried by using the
 arrow buttons.
 
 When a number is busy or fails, &lt;i&gt;kppp&lt;/i&gt; will 
 try the next number and so on</source>
         <translation>&lt;p&gt;Gibt die zu wählende Telefonnummer an.
 Sie können hier mehrere Nummern angeben
 durhc Verwenden von &quot;Hinzu&quot;. Sie können die
 Reihenfolge der zu verwendenen Nummern ändern,
 indem sie die Pfeil-Tasten verwenden.
 
 Ist eine Nummer besetzt oder ungültig wird &lt;i&gt;kppp&lt;/I&gt; 
 die nächste Nummer versuchen</translation>
     </message>
     <message>
         <source>Customize pppd Arguments...</source>
         <translation>pppd-Parameter spezifizieren...</translation>
     </message>
 </context>
 <context>
     <name>ExecWidget</name>
     <message>
         <source>Here you can select commands to run at certain stages of the connection. The commands are run with your real user id, so you cannot run any commands here requiring root permissions (unless, of course, you are root).&lt;br&gt;&lt;br&gt;Be sure to supply the whole path to the program otherwise we might be unable to find it.</source>
         <translation>Hier können Befehle eingegeben werden die 
 in unterschieldichen Stufen des Verbindungsaufbaus
 ausgeführt werden.
 Befehle die root-Rechte benötigen können nicht 
 verwendet werden, solange Sie nicht als root angemeldet sind.</translation>
     </message>
     <message>
         <source>Before connect:</source>
         <translation>Vor der Verbindung:</translation>
     </message>
     <message>
         <source>Allows you to run a program &lt;b&gt;before&lt;/b&gt; a connection
 is established. It is called immediately before
 dialing has begun.
 
 This might be useful, e.g. to stop HylaFAX blocking the
 modem.</source>
         <translation>Ermöglicht das Ausführen eines Programms &lt;b&gt;bevor&lt;/b&gt; 
 eine Verbindung aufgebaut wird. Es wird unmittelbar 
 aufgerufen bevor der Wählvorgang initiiert wird.
 
 Das kann bspw. notwendig sein um Programme zu stoppen 
 die das Modem blockieren.</translation>
     </message>
     <message>
         <source>Upon connect:</source>
         <translation>Bei Verbindung:</translation>
     </message>
     <message>
         <source>Allows you to run a program &lt;b&gt;after&lt;/b&gt; a connection
 is established. When your program is called, all
 preparations for an Internet connection are finished.
 
 Very useful for fetching mail and news</source>
         <translation>Ermöglicht das Ausführen eines Programms &lt;b&gt;nachdem&lt;/b&gt; 
 eine Verbindung aufgebaut wird. Zu diesem Zeitpunkt besteht 
 bereits eine Internetverbindung.
 
 Sehr nützlich um bspw. Mail und News zu holen</translation>
     </message>
     <message>
         <source>Before disconnect:</source>
         <translation>Vor dem Verbindungsabbau:</translation>
     </message>
     <message>
         <source>Allows you to run a program &lt;b&gt;before&lt;/b&gt; a connection
 is closed. The connection will stay open until
 the program exits.</source>
         <translation>Ermöglicht das Ausführen eines Programms &lt;b&gt;bevor&lt;/b&gt; 
 eine Verbindung abgebaut wird. Die Verbindung bleibt
 bestehen bis das Programm beendet ist.</translation>
     </message>
     <message>
         <source>Upon disconnect:</source>
         <translation>Bei Verbindungsabbau:</translation>
     </message>
     <message>
         <source>Allows you to run a program &lt;b&gt;after&lt;/b&gt; a connection
 has been closed.</source>
         <translation>Ermöglicht das Ausführen eines Programms &lt;b&gt;nachdem&lt;/b&gt; 
 eine Verbindung abgebaut ist.</translation>
     </message>
 </context>
 <context>
     <name>GatewayWidget</name>
     <message>
         <source>Configuration</source>
         <translation>Konfiguration</translation>
     </message>
     <message>
         <source>Default gateway</source>
         <translation>Default Gateway</translation>
     </message>
     <message>
         <source>This makes the PPP peer computer (the computer
 you are connected to with your modem) to act as
 a gateway. Your computer will send all packets not
 going to a computer inside your local net to this
 computer, which will route these packets.
 
 This is the default for most ISPs, so you should
 probably leave this option on.</source>
         <translation>Dies lässt die PPP-Gegenstelle als Router auftreten.
 
 Dies ist normal für die meisten ISPs, daher sollte diese 
 Option normalerweise angeschaltet sein.</translation>
     </message>
     <message>
         <source>Static gateway</source>
         <translation>Statisches Gateway</translation>
     </message>
     <message>
         <source>&lt;p&gt;Allows you to specify which computer you want
 to use as gateway (see &lt;i&gt;Default Gateway&lt;/i&gt; above)</source>
         <translation>&lt;p&gt;Ermöglicht die Angabe eines Routers (s.
 &lt;i&gt;Default Gateway&lt;/i&gt;)</translation>
     </message>
     <message>
         <source>Gateway IP address:</source>
         <translation>Gateway IP Addresse:</translation>
     </message>
     <message>
         <source>Assign the default route to this gateway</source>
         <translation>Setzen der Default Route für dieses Gateway</translation>
     </message>
     <message>
         <source>If this option is enabled, all packets not
 going to the local net are routed through
 the PPP connection.
 
 Normally, you should turn this on</source>
         <translation>Ist diese Option angeschaltet werden alle 
 Pakete die nicht ins lokale Netz gehen über PPP
 geroutet.
 
 Normalerweise sollte diese Aoption einschaltet sein</translation>
     </message>
 </context>
 <context>
     <name>IPWidget</name>
     <message>
         <source>Configuration</source>
         <translation>Konfiguration</translation>
     </message>
     <message>
         <source>Dynamic IP address</source>
         <translation>Dynamische IP Addresse</translation>
     </message>
     <message>
         <source>Select this option when your computer gets an
 internet address (IP) every time a
 connection is made.
 
 Almost every Internet Service Provider uses
 this method, so this should be turned on.</source>
         <translation>Wählen Sie diese Option wenn Ihr Rechner
 automatisch eine IP-Adresse vom ISP bei 
 Verbindungsaufbau bezieht.
 
 Die meisten ISPs benutzen diese Option.</translation>
     </message>
     <message>
         <source>Static IP address</source>
         <translation>Statische IP Adresse</translation>
     </message>
     <message>
         <source>Select this option when your computer has a
 fixed internet address (IP). Most computers
 don&apos;t have this, so you should probably select
 dynamic IP addressing unless you know what you
 are doing.</source>
         <translation>Wählen Sie diese Option wenn Ihr Rechner eine
 statische IP-Adresse besitzt. Dies ist nicht die Regel,
 so dass es eine gute Idee ist dynamische Adressen
 zu verwenden.</translation>
     </message>
     <message>
         <source>IP address:</source>
         <translation>IP Adresse:</translation>
     </message>
     <message>
         <source>If your computer has a permanent internet
 address, you must supply your IP address here.</source>
         <translation>Hat Ihr Rechner eine permanente Verbindung
 ins Internet muss die Adresse hier angegebn werden.</translation>
     </message>
     <message>
         <source>Subnet mask:</source>
         <translation>Subnetzmaske:</translation>
     </message>
     <message>
         <source>&lt;p&gt;If your computer has a static Internet address,
 you must supply a network mask here. In almost
 all cases this netmask will be &lt;b&gt;255.255.255.0&lt;/b&gt;,
 but your mileage may vary.
 
 If unsure, contact your Internet Service Provider</source>
         <translation>&lt;p&gt;Hat Ihr Rechner eine statische Internet-Adresse
 muss die Netzwerkmaske hier angegeben werden. In den 
 meisten Fällen ist dies &lt;b&gt;255.255.255.0&lt;/b&gt;, dies kann jedoch 
 auch anders sein.
 
 Wenn Sie unsicher sind kontaktieren Sie Ihren ISP</translation>
     </message>
     <message>
         <source>Auto-configure hostname from this IP</source>
         <translation>Hostnamen-Autokonfiguration</translation>
     </message>
     <message>
         <source>&lt;p&gt;Whenever you connect, this reconfigures
 your hostname to match the IP address you
 got from the PPP server. This may be useful
 if you need to use a protocol which depends
 on this information, but it can also cause several
 &lt;a href=&quot;kppp-7.html#autohostname&quot;&gt;problems&lt;/a&gt;.
 
 Don&apos;t enable this unless you really need it.</source>
         <translation>&lt;p&gt;Bei jeder Verbindung wird Ihr Hostname so
 verändert, dass er der IP Adresse entspricht, die
 vom PPP Server erhalten wurde. Dies kann bei
 Protokollen nützlich sein, die diese Information
 benötigen, kann aber auch zu einigen &lt;a href=&quot;kppp-7.html#autohostname&quot;&gt;Problemen&lt;/a&gt;
 führen.
 
 Bitte nicht anschalten, wenn nicht benötigt.</translation>
     </message>
     <message>
         <source>Selecting this option might cause some weird problems with the X-server and applications while kppp is connected. Don&apos;t use it until you know what you are doing!
 For more information take a look at the handbook (or help) in the section &quot;Frequently asked questions&quot;.</source>
         <translation>Diese Option zu wählen könnte merkwürdige Probleme mit dem X-Server und Anwendungen produzieren während kppp verbunden ist. Tun Sie es nicht, wenn Sie nicht wissen, was Sie hier tun!
 Für mehr information schauen Sie in das Handbuch (oder die Hilfe) unter der Sektion &quot;Regelmässig gestellte Fragen&quot;.</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
 </context>
 <context>
     <name>InterfacePPP</name>
     <message>
         <source>No password</source>
         <translation>Kein Passwort</translation>
     </message>
     <message>
         <source>Username defined but no password
  Please enter a password</source>
         <translation>Nutzername vorhanden aber kein Passwort
 Bitte Passwort eingeben</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
 </context>
 <context>
     <name>ModemTransfer</name>
     <message>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
 </context>
 <context>
     <name>ModemWidget</name>
     <message>
         <source>Modem &amp;name:</source>
         <translation>Modem &amp;Name:</translation>
     </message>
     <message>
         <source>Modem de&amp;vice:</source>
         <translation>Modem &amp;Gerät:</translation>
     </message>
     <message>
         <source>This specifies the serial port your modem is attached 
 to. On Linux/x86, typically this is either /dev/ttyS0 
 (COM1 under DOS) or /dev/ttyS1 (COM2 under DOS).
 
 If you have an internal ISDN card with AT command
 emulation (most cards under Linux support this), you
 should select one of the /dev/ttyIx devices.</source>
         <translation>Dies gibt den seriellen Port an, an dem das Modem angeschlossen
 ist. Auf Linux/x86 ist das typischer Weise entweder /dev/ttyS0
 (COM1 unter DOS) oder /dev/ttyS1 (COM2 unter DOS).
 
 Wenn Sie eine interner ISDN Karte mit AT Kommando Emulation
 haben (die meisten Karten unter Linux unterstützen dies), sollten
 eines der /dev/ttyIx Geräte auswählen.</translation>
     </message>
     <message>
         <source>&amp;Flow control:</source>
         <translation>&amp;Fluss Kontrolle:</translation>
     </message>
     <message>
         <source>Hardware [CRTSCTS]</source>
         <translation>Hardware [CRTSCTS]</translation>
     </message>
     <message>
         <source>Software [XON/XOFF]</source>
         <translation>Software [XON/XOFF]</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Keine</translation>
     </message>
     <message>
         <source>&lt;p&gt;Specifies how the serial port and modem
 communicate. You should not change this unless
 you know what you are doing.
 
 &lt;b&gt;Default&lt;/b&gt;: CRTSCTS</source>
         <translation>&lt;p&gt;Gibt an, wie der serielle Port und das Modem
 kommunizieren. Sollte nicht geändert werden, wenn
 man nicht weiß, was man tut.
 
 &lt;b&gt;Standard&lt;/b&gt;: CRTSCTS</translation>
     </message>
     <message>
         <source>&amp;Line termination:</source>
         <translation>&amp;Zeilenende:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Specifies how AT commands are sent to your
 modem. Most modems will work fine with the
 default &lt;i&gt;CR/LF&lt;/i&gt;. If your modem does not react
 to the init string, you should try different
 settings here
 
 &lt;b&gt;Default&lt;/b&gt;: CR/LF</source>
         <translation>&lt;p&gt;Gibt an, wie AT Kommandos zum Modem
 gesendet werden. Normaler Weise ist der Standard
 &lt;i&gt;CR/LF&lt;/i&gt; völlig okay. Wenn das Modem nicht auf
 die Initialisierung antwortet, sollten hier andere 
 Einstellungen probiert werden.
 
 &lt;b&gt;Standardt&lt;/b&gt;: CR/LF</translation>
     </message>
     <message>
         <source>Co&amp;nnection speed:</source>
         <translation>&amp;Verbindungs-
 geschwindigkeit:</translation>
     </message>
     <message>
         <source>Specifies the speed your modem and the serial
 port talk to each other. You should begin with
 the default of 38400 bits/sec. If everything
 works you can try to increase this value, but to
 no more than 115200 bits/sec (unless you know
 that your serial port supports higher speeds).</source>
         <translation>Gibt die Geschwindigkeit an, mit der sich das
 Modem und die ser. Schnittstelle unterhalten.
 Sie sollten mit 38400 bits/Sek beginnen, wenn
 alles funktioniert, erhöhen Sie, aber nie mehr
 als 115200 bits/Sek, ausser Sie wissen, dass
 Ihre Schnittstelle das unterstützt.</translation>
     </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
@@ -1,170 +1,166 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Anwendungs CPU Auslastung (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>System CPU Auslastung (%)</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Diese Seite zeigt, inwieweit der Prozessor ausgelastet wird.</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Typ:</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation>Diese Seite zeigt wie viel Speicher (z.B. RAM) Ihres Geräts genutzt wird.
 Speicher wird wie folgt eingeteilt:
 
 1. Benutzt- Speicher der von Opie und laufenden Anwendungen genutzt  wird.
 2. Puffer- temporärer Speicher, wird benutzt um die Performance zu verbessern
 3. Cache- Information die kürzlich genutzt aber noch nicht wieder freigegeben wurde
 4. Frei- Speicher der weder von Opie noch von Anwendungen genutzt wird.</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Gesamtspeicher: %1 kB</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Genutzt (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Puffer (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Gechached (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Frei (%1 kB)</translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation>Gesamt Swap: %1 kB</translation>
     </message>
 </context>
 <context>
     <name>MemoryStatus</name>
     <message>
         <source>Memory Status</source>
         <translation>Speicherstatus</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Speicher</translation>
     </message>
     <message>
         <source>Swapfile</source>
         <translation>Auslagerungsdatei</translation>
     </message>
     <message>
         <source>&lt;center&gt;&lt;b&gt;Memory Monitor Plugin&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Based on source code from:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;This program is licensed under GNU GPL.&lt;/center&gt;</source>
         <translation>&lt;center&gt;&lt;b&gt;Memory Monitor Plugin&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Basierende auf Code von:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;Diese Anwendung ist lizensiert unter der GNU GPL.&lt;/center&gt;</translation>
     </message>
     <message>
         <source>About</source>
         <translation>Über</translation>
     </message>
 </context>
 <context>
     <name>Swapfile</name>
     <message>
         <source>Swapfile location</source>
         <translation>Auslagerungsdatei</translation>
     </message>
     <message>
         <source>RAM</source>
         <translation>RAM</translation>
     </message>
     <message>
         <source>CF Card</source>
         <translation>CF Card</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>SD Card</translation>
     </message>
     <message>
         <source> On </source>
         <translation>An</translation>
     </message>
     <message>
         <source> Off </source>
         <translation>Aus</translation>
     </message>
     <message>
         <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>
         <source>Failed to initialize swapfile.</source>
         <translation>Auslagerungsdatei konnte nicht initialisiert werden.</translation>
     </message>
     <message>
         <source>Swapfile created.</source>
         <translation>Auslagerungsdate erzeugt.</translation>
     </message>
     <message>
         <source>Failed to remove swapfile.</source>
         <translation>Auslagerungsdatei konnte nicht entfernt werden.</translation>
     </message>
     <message>
         <source>Swapfile removed.</source>
         <translation>Auslagerungsdate entfernt.</translation>
     </message>
     <message>
         <source>Swapfile activated.</source>
         <translation>Auslagerungsdate aktiviert.</translation>
     </message>
     <message>
         <source></source>
         <translation></translation>
     </message>
     <message>
         <source>2 Mb,4 Mb,6 Mb,8 Mb,16 Mb,32 Mb,64 Mb</source>
         <translation>2 MB, 4 MB, 6 MB, 8 MB, 16 MB, 32 MB, 64 MB</translation>
     </message>
 </context>
 </TS>
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
@@ -1,101 +1,97 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation>Gelenk3</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation>Addressbutton</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation>Menubutton</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation>Mailbutton</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation>Homebutton</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation>Aufnahmebutton</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation>Unten+Hoch</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation>Unten+Runter</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation>Unten+Rechts</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation>Unten+Links</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation>Hoch+Rauf</translation>
     </message>
     <message>
         <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>
         <source>Todo Button</source>
         <translation>Todo-Button</translation>
     </message>
     <message>
         <source>Hinge1</source>
         <translation>Gelenk1</translation>
     </message>
     <message>
         <source>Hinge2</source>
         <translation>Gelenk2</translation>
     </message>
     <message>
         <source>Hinge3</source>
         <translation>Gelenk3</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Trash</source>
         <translation>Müll</translation>
     </message>
 </context>
 </TS>
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,1171 +1,728 @@
 <!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>
     </message>
     <message>
         <source>Week</source>
         <translation>Woche</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Monat</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Jahr</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Jeden:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Häufigkeit</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Endet am:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Kein Enddatum</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Wiederholung an</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Mon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Di</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Mi</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Do</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Fr</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sa</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>So</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Jeden</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>WeekVar</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceWidget</name>
     <message>
         <source>No End Date</source>
         <translation>Kein Enddatum</translation>
     </message>
     <message>
         <source>days</source>
         <translation>Tage</translation>
     </message>
     <message>
         <source>day</source>
         <translation>Tag</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>Wochen</translation>
     </message>
     <message>
         <source>week</source>
         <translation>Woche</translation>
     </message>
     <message>
         <source>months</source>
         <translation>Monate</translation>
     </message>
     <message>
         <source>month</source>
         <translation>Monat</translation>
     </message>
     <message>
         <source>years</source>
         <translation>Jahre</translation>
     </message>
     <message>
         <source>year</source>
         <translation>Jahr</translation>
     </message>
     <message>
         <source> and </source>
         <translation>und </translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
 und</translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, and</translation>
     </message>
     <message>
         <source>on </source>
         <translation>an</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation>Keine Wiederholung</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>Tag(e)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Wiederholung an</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Mon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Di</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Mi</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Do</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Fr</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sa</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>So</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>Woche(n)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Wiederholen bis</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Tag</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>Monat(e)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>Jahr(e)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Jeden</translation>
     </message>
 </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>
     </message>
     <message>
         <source>View</source>
         <translation>Ansicht</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
         <source>Click here to create a new item.</source>
         <translation>Hier klicken, um ein neues Element zu erstellen.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Bearbeiten</translation>
     </message>
     <message>
         <source>Click here to edit the selected item.</source>
         <translation>Hier klicken, um das ausgewählte Element zu bearbeiten.</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Kopieren</translation>
     </message>
     <message>
         <source>Click here to duplicate the selected item.</source>
         <translation>Hier klicken, um das ausgewählte Element zu kopieren.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Click here to delete the selected item.</source>
         <translation>Hier klicken, um das ausgewählte Element zu löschen.</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Senden</translation>
     </message>
     <message>
         <source>Click here to transmit the selected item.</source>
         <translation>Hier klicken, um das gewählte Element zu übertragen.</translation>
     </message>
     <message>
         <source>Configure</source>
         <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>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Fälligkeit:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorie:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation>Stand. EMail: </translation>
     </message>
     <message>
-        <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
-        <translation type="obsolete">&lt;b&gt;Arbeitsadresse:&lt;/b&gt;</translation>
-    </message>
-    <message>
         <source>Office: </source>
         <translation>Büro: </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>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>
         <source>Home Mobile: </source>
         <translation>Handy / Privat: </translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation>Alle Emails: </translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Beruf: </translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Assistent: </translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Manager: </translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Mann</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Frau</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Geschlecht:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Ehepartner: </translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Geburtstag: </translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Jahrestag: </translation>
     </message>
     <message>
         <source>Children: </source>
         <translation>Kinder: </translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Spitzname: </translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notizen:</translation>
     </message>
     <message>
         <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>
         <source>Wednesday</source>
         <translation>Mittwoch</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Donnerstag</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Freitag</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Samstag</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Sonntag</translation>
     </message>
     <message>
         <source>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>
         <source>Low</source>
         <translation>Niedrig</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation>Sehr niedrig</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Ort:</translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation>Das ist ein Termin ohne Zeit</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation>Das ist ein mehrtägiger Termin</translation>
     </message>
     <message>
-        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
-        <translation 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>
         <source>User Id</source>
         <translation>Nutzer Id</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>Kategorien</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Titel</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Vorname</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Mittelname</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Nachname</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Suffix</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Speichern als</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Tätigkeit</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Abteilung</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Firma</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Telefon / Büro</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Fax / Büro</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Handy / Büro</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>Standard EMail</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>EMails</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Telefon / Privat</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Fax / Privat</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Handy / Privat</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Strasse / Büro</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Stadt / Büro</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>Staat / Büro</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>PLZ / Büro</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>Land / Büro</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Piepser / Büro</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Webseite / Büro</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Büro</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Beruf</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Assistent</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Manager</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Strasse / Privat</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Stadt / Privat</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>Staat / Privat</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>PLZ / Privat</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>Land / Privat</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Webseite / Privat</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Ehepartner</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Geschlecht</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Geburtstag</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Jahrestag</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Spitzname</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Kinder</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notizen</translation>
     </message>
     <message>
         <source>Has a due-date</source>
         <translation>Hat ein Fälligkeitsdatum</translation>
     </message>
     <message>
         <source>No due-date</source>
         <translation>Kein Fälligkeitsdatum</translation>
     </message>
     <message>
         <source>Completed</source>
         <translation>Beendet</translation>
     </message>
     <message>
         <source>Not completed</source>
         <translation>Nicht beendet</translation>
     </message>
     <message>
         <source>No reccurrence</source>
         <translation>Keine Wiederholung</translation>
     </message>
     <message>
         <source>No start-date</source>
         <translation>Kein Startdatum</translation>
     </message>
     <message>
         <source>No completed-date</source>
         <translation>Kein Fertigdatum</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>st</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>nd</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>rd</translation>
     </message>
     <message>
         <source>th</source>
         <translation>th</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/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,846 +1,176 @@
 <!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>
     </message>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation>OTimePickerDialogBase</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation>Dateityp</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Öffnen</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Speichern</translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation>Wähle Verzeichnis</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation>Name:</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation>Stil</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation>Falsches Üben von Xylophonmusik quält jeden größeren Zwerg</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation>Konfiguriere Tasten</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation>Pixmap</translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation>Name</translation>
     </message>
     <message>
         <source>Key</source>
         <translation>Taste</translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation>Vorgabe Taste</translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation>Abkürzungstaste für gewählte Aktion</translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation>&amp;Keine</translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation>&amp;Vorgabe</translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation>&amp;Eigene</translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation>Konfiguriere Tasten</translation>
     </message>
     <message>
         <source>Default: </source>
         <translation>Vorgabe:</translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation>Taste ist in der Blacklist</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>&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
@@ -1,1053 +1,1000 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Nicht zugewiesen</translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation>(Mehrere)</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Geschäftlich</translation>
     </message>
     <message>
         <source>Personal</source>
         <translation>Privat</translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation>(Mehrere)</translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>Neue Kategorie</translation>
     </message>
     <message>
         <source>New Category </source>
         <translation>Neue Kategorie</translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation>Kategorie bearbeiten</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>Kategorien</translation>
     </message>
     <message>
         <source>Application</source>
         <translation>Anwendung</translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation>Kategorien hier hinein</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Neu</translation>
     </message>
     <message>
         <source>Global</source>
         <translation>Global</translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation>Überprüfen Sie die Kategorie zu der dieses Dokument gehört.</translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation>Bitte geben Sie eine neue Kategorie ein. Drücken Sie &lt;b&gt;Neu&lt;/b&gt; um sie zur Liste hinzuzufügen.</translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation>Sie können links eine neue Kategorie einfügen und durch Drücken von &lt;b&gt;Neu&lt;/b&gt; sie zur Liste hinzuzufügen.</translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation>Hier drücken, um eine ausgewählte Kategorie zu entfernen.</translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation>Auswählen um diese Eigenschaft allen Anwendungen verfügbar zu machen.</translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Nicht zugewiesen</translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation>Eine andere Anwendung bearbeitet gerade 
 die Kategorien.</translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation>Kategorien bearbeiten</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation>Januar des ausgewählten Jahres anzeigen</translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation>Vorherigen Monat anzeigen</translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation>Nächsten Monat anzeigen</translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation>Dezember des ausgewählten Jahres anzeigen</translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation>Dateidialog schließen</translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation>Dokumente dieses Typs anzeigen</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Dokumentenansicht</translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation>Dokumente dieser Kategorie anzeigen</translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation>Klicken, um ein Dokument aus der Liste auszuwählen</translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation>, oder wählen Sie &lt;b&gt;Neues Dokument&lt;/b&gt;, um ein neues Dokument zu erstellen.</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation>&lt;br&gt;&lt;br&gt;Klicken und Halten für die Dokumenteigenschaften.</translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <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>
         <source>Find what:</source>
         <translation>Suchen nach: </translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorie: </translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation>Suche starten bei: </translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation>2. Dez. 01</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Groß- und Kleinschreibung beachten</translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation>Rückwärts suchen</translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Document View</source>
         <translation>Dokumentenansicht</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation>Löschen fehlgeschlagen</translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation>Kopie von</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplikat</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>Löschen fehlgeschlagen</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Details</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>Verschieben nicht möglich</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Medium</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Eigenschaften</translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation>Details</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>Kommentar: </translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Typ: </translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Name: </translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Ort: </translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation>Schnellladen (benötigt Speicher)</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Kopieren</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Beamen</translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation>Das Medium auf dem sich das Dokument befindet</translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation>Der Dokumentname</translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation>Vorsorgliches Laden der Anwendung für schnellere Verfügbarkeit.</translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation>Dokument löschen</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation>Dokument kopieren</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation>Dokument auf ein anderes Gerät beamen.</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation>Anwendungsspezifische Rotation</translation>
     </message>
     <message>
         <source>Arguments:</source>
         <translation>Argumente:</translation>
     </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>Benutzerinformationen</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Passwort eingeben</translation>
     </message>
 </context>
 <context>
     <name>QMessageBox</name>
     <message>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nein</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Speicher erschöpft</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>Ein Problem beim Erstellen 
 der Konfigurationsinformationen ist aufgetreten. 
 Bitte machen Sie entsprechenden Speicher frei 
 und versuchen Sie es noch einmal.
 </translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation>Erstellen der Startdateien nicht möglich.
 Bitte machen Sie entsprechenden Speicher 
 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>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Adresse priv.:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation>Mail Adresse: </translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Tel. priv.: </translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Fax priv.: </translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Handy priv.: </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Web priv.: </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Web gesch.: </translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Büro: </translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Gesch.Tel.: </translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Gesch. Fax: </translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Gesch. Handy: </translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Gesch. Pager:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Beruf: </translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Assistent: </translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Vorgesetzter: </translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Männlich</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Weiblich</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Geschlecht: </translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Partner: </translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Geburtstag: </translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Jahrestag: </translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Spitzname: </translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Titel</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Vorname</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Zweitname</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Nachname</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Suffix</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Ablegen als</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Berufsbezeichnung</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Abteilung</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Firma</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Tel. gesch.</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Fax gesch.</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Handy gesch.</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>Standardmail</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>Mailadressen</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Tel. priv.</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Fax priv.</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Handy priv.</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Straße gesch.</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Stadt gesch.</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>Land gesch.</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>PLZ gesch.</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>Staat gesch.</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Pieper gesch.</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Web gesch.</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Büro</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Beruf</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Assistent</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Vorgestzter</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Strasse priv.</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Stadt priv.</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>Land priv.</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>PLZ priv.</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>Staat priv.</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Web priv.</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Partner</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Geschlecht</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Geburtstag</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Jahrestag</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Spitzname</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Kinder</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notizen</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Gruppen</translation>
     </message>
     <message>
         <source>New Document</source>
         <translation>Neues Dokument</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Mon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Die</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Mit</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Don</translation>
     </message>
     <message>
         <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>
     <message>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
         <source>Mar</source>
         <translation>Mär</translation>
     </message>
     <message>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
         <source>May</source>
         <translation>Mai</translation>
     </message>
     <message>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
         <source>Aug</source>
         <translation>Aug</translation>
     </message>
     <message>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
         <source>Oct</source>
         <translation>Okt</translation>
     </message>
     <message>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
         <source>Dec</source>
         <translation>Dez</translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation 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>
     <message>
         <source>%1 document</source>
         <translation>%1 Dokument</translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation>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>Klicken Sie hier, um das Fenster zu schließen.</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation>Klicken Sie hier, um das Fenster zu schließen und alle Änderungen zu akzeptieren.</translation>
     </message>
     <message>
         <source>Click to make this window movable.</source>
         <translation>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>Klicken sie hier, um das Fenster zu maximieren.</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation>Wiederherstellen</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>Verschieben</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>Maximize</source>
         <translation>Maximieren</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>CF-Karte</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Festplatte</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>SD-Karte</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>SCSI Festplatte</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>interner Speicher</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>interner Hauptspeicher</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>MMC-Karte</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>Keine</translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation>Citytime-Programm nicht gefunden</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation>Bitte installieren Sie opie-citytime 
 zur Einstellung der Zeitzonen.</translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Kein Speicher vorhanden</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space 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>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>%1 Dateien</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>%1 %2</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>Alle %1-Dateien</translation>
     </message>
     <message>
         <source>All files</source>
         <translation>Alle Dateien</translation>
     </message>
 </context>
 <context>
     <name>WindowDecoration</name>
     <message>
         <source>Default</source>
         <comment>List box text for default window decoration</comment>
         <translation>Voreinstellung</translation>
     </message>
 </context>
 </TS>
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
@@ -1,115 +1,103 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AddressBookPluginConfig</name>
     <message>
         <source>Max Lines: </source>
         <translation>Anzahl. Einträge: </translation>
     </message>
     <message>
         <source>Set the maximum number of lines that should be shown for each anniversaries/birthdays</source>
         <translation>Setzt die maximale Anzahl an Einträgen imgegeben Zeitraum</translation>
     </message>
     <message>
-        <source>Clip line after X chars: </source>
-        <translation 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>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation>Die Farbe des Eintrags selbs !</translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation>Setzt die Farbe für
 fällige Termine</translation>
     </message>
     <message>
         <source> days: </source>
         <translation>Tage: </translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation>Diese Farbe wird benutzt wenn der Termin kurz bevorsteht !</translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation>Diese Farbe wird benutzt wenn der Termin näher ist als der eingestellte Zeitraum !</translation>
     </message>
     <message>
         <source>Enable/Disable Views</source>
         <translation>Ansichten Ein-/Ausschalten</translation>
     </message>
     <message>
         <source>Show &amp;Birthdays</source>
         <translation>Ge&amp;burtstage anzeigen</translation>
     </message>
     <message>
         <source>Show &amp;Anniveraries</source>
         <translation>J&amp;ahrestage anzeigen</translation>
     </message>
     <message>
         <source>The next birthdays will just be shown, if enabled!</source>
         <translation>Die nächsten Geburtstage werde angezeigt falls aktiviert!</translation>
     </message>
     <message>
         <source>The next anniversaries will just be shown, if enabled !</source>
         <translation>Die nächsten Jahrestage werden angezeigt falls aktiviert!</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>AddressBook plugin</source>
         <translation>Addressbuch-Plugin</translation>
     </message>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>Nächste Geburtstage in &lt;b&gt;%1&lt;/b&gt; Tagen: </translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>Keine Geburtstage in  &lt;b&gt;%1&lt;/b&gt; Tagen!</translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>Nächste Jahrestage in &lt;b&gt;%1&lt;/b&gt; Tagen: </translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>Keine Jahrestage in &lt;b&gt;%1&lt;/b&gt; Tagen !</translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation>Die Datenbank kann die Anfrage nicht durchführen. Vermutlich muss das libopie-Paket upgegradet werden ! &lt;br&gt;</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/libtodaydatebookplugin.ts b/i18n/de/libtodaydatebookplugin.ts
index 68ab5bc..52f3007 100644
--- a/i18n/de/libtodaydatebookplugin.ts
+++ b/i18n/de/libtodaydatebookplugin.ts
@@ -1,146 +1,88 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <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>
     </message>
     <message>
         <source>Show notes</source>
         <translation>Notizen anzeigen</translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
         <translation>Auswählen, um die angehängte Notiz anzuzeigen</translation>
     </message>
     <message>
         <source>Show only later appointments</source>
         <translation>Nur spätere Termine zeigen</translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
         <translation>Auswählen, um nur spätere Termine anzuzeigen</translation>
     </message>
     <message>
         <source>Show time in extra line</source>
         <translation>Zeit in extra Zeile</translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
         <translation>Wieviele Termine maxiaml angezeigt werden. In chronologischer Reihenfolge</translation>
     </message>
     <message>
         <source>How many appointment should be shown?</source>
         <translation>Wieviele Termine sollen gezeigt werden?</translation>
     </message>
     <message>
         <source>only today</source>
         <translation>Nur heute</translation>
     </message>
     <message>
         <source>How many more days should be in the range</source>
         <translation>Wieviele Tage imVoraus sollen angezeigt werden</translation>
     </message>
     <message>
         <source>How many more days</source>
         <translation>Wieviele weitere Tage</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Datebook plugin</source>
         <translation>Terminplaner plugin</translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation>Keine weiteren Termine heute</translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation>Keine Termine heute</translation>
     </message>
 </context>
 </TS>
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
@@ -1,59 +1,40 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>Todolist plugin</source>
         <translation>Todolist plugin</translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation>Es gibt &lt;b&gt; 1&lt;/b&gt; aktive Aufgabe: &lt;br&gt;</translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation>Es gibt &lt;b&gt; %1&lt;/b&gt; aktive Aufgaben: &lt;br&gt;</translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation>Keine aktiven Aufgaben</translation>
     </message>
 </context>
 <context>
     <name>TodoPluginConfigBase</name>
     <message>
         <source>Set the maximum number of task that should be shown</source>
         <translation>Setzt die Zahl der maximal angezeigten Aufgaben</translation>
     </message>
     <message>
         <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
@@ -1,122 +1,118 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>QObject</name>
     <message>
         <source>Weather plugin</source>
         <translation>Wetterplugin</translation>
     </message>
 </context>
 <context>
     <name>WeatherPluginConfig</name>
     <message>
         <source>Enter ICAO location identifier:</source>
         <translation>Geben Sie den ICAO-Code ein:</translation>
     </message>
     <message>
         <source>Enter the 4 letter code for the desired location here.  See http://www.nws.noaa.gov/tg/siteloc.shtml to find a location near you.</source>
         <translation>Geben Sie hier den ICAO-Code des gewünschten Ortes ein . Unter http://www.nws.noaa.gov/tg/siteloc.shtml finden Sie die Codes aller Orte in Ihrer  Umgebung.</translation>
     </message>
     <message>
         <source>Visit http://www.nws.noaa.gov/tg/siteloc.shtml to find the nearest location.</source>
         <translation>Unter http://www.nws.noaa.gov/tg/siteloc.shtml finden Sie den nächstgelegenen Ort.</translation>
     </message>
     <message>
         <source>Use metric units</source>
         <translation>Metrische Einheiten</translation>
     </message>
     <message>
         <source>Click here to select type of units displayed.</source>
         <translation>Hier klicken, um den Einheitentyp auszuwählen.</translation>
     </message>
     <message>
         <source>Update frequency (in minutes):</source>
         <translation>Updaterate (Minuten):</translation>
     </message>
     <message>
         <source>Select how often (in minutes) you want the weather to be updated.</source>
         <translation>Wählen Sie, wie of (in Minuten) sie möchten dass  die Wetteranzeige aktualisiert wird.</translation>
     </message>
 </context>
 <context>
     <name>WeatherPluginWidget</name>
     <message>
         <source>Retreiving current weather information.</source>
         <translation>Holen der Wetterinformationen.</translation>
     </message>
     <message>
         <source>Temp: </source>
         <translation>Temp:</translation>
     </message>
     <message>
         <source>  Wind: </source>
         <translation> Wind: </translation>
     </message>
     <message>
         <source>
 Pres: </source>
         <translation>
 Druck:</translation>
     </message>
     <message>
         <source>Current weather data not available.</source>
         <translation>Keine aktuellen Daten gefunden.</translation>
     </message>
     <message>
         <source>n/a</source>
         <translation>n/a</translation>
     </message>
     <message>
         <source>E </source>
         <translation>O</translation>
     </message>
     <message>
         <source>NE </source>
         <translation>NO</translation>
     </message>
     <message>
         <source>N </source>
         <translation>N</translation>
     </message>
     <message>
         <source>NW </source>
         <translation>NW</translation>
     </message>
     <message>
         <source>W </source>
         <translation>W</translation>
     </message>
     <message>
         <source>SW </source>
         <translation>SW</translation>
     </message>
     <message>
         <source>S </source>
         <translation>S</translation>
     </message>
     <message>
         <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
@@ -1,41 +1,37 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>VPNGUI</name>
     <message>
         <source>VPN</source>
         <translation></translation>
     </message>
     <message>
         <source>Name</source>
         <translation></translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Bschreibung</translation>
     </message>
     <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
@@ -1,42 +1,38 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>MindBreaker</name>
     <message>
         <source>New Game</source>
         <translation>Neues Spiel</translation>
     </message>
     <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>
     <message>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
 </context>
 </TS>
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
@@ -1,38 +1,34 @@
 <!DOCTYPE TS><TS>
 <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>
         <source>Game</source>
         <translation>Spiel</translation>
     </message>
     <message>
         <source>Mine Sweep</source>
         <translation>Mine Sweep</translation>
     </message>
 </context>
 </TS>
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,89 +1,50 @@
 <!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>
         <source>Image:</source>
         <translation>Bild:</translation>
     </message>
 </context>
 </TS>
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
@@ -417,523 +417,503 @@ Der Unicode Wert der Taste</translation>
     <message>
         <source>Device</source>
         <translation>Gerät</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Configure Profiles</source>
         <translation>Profile konfigurieren</translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation>Neue Verbindung</translation>
     </message>
     <message>
         <source>Save Connection</source>
         <translation>Verbindung speichern</translation>
     </message>
     <message>
         <source>Connect</source>
         <translation>Verbinden</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>Auflegen</translation>
     </message>
     <message>
         <source>QuickLaunch</source>
         <translation>SchnellStart</translation>
     </message>
     <message>
         <source>The shell button launches the &quot;default&quot; profile. If there is none default values are taken</source>
         <translation>Der Shell Knopf lädt das &quot;default&quot; Profil. Wenn es keines gibt, werden Standardwerte genommen</translation>
     </message>
     <message>
         <source>Transfer file...</source>
         <translation>Datei übertragen...</translation>
     </message>
     <message>
         <source>Line wrap</source>
         <translation>Zeilenumbruch</translation>
     </message>
     <message>
         <source>Full screen</source>
         <translation>Vollbild</translation>
     </message>
     <message>
         <source>Save history</source>
         <translation>Historie speichern</translation>
     </message>
     <message>
         <source>Terminate</source>
         <translation>Beenden</translation>
     </message>
     <message>
         <source>Close Window</source>
         <translation>Fenster schließen</translation>
     </message>
     <message>
         <source>Run Script</source>
         <translation>Skript ausführen</translation>
     </message>
     <message>
         <source>Record Script</source>
         <translation>Skript aufnehmen</translation>
     </message>
     <message>
         <source>Save Script</source>
         <translation>Skript speichern</translation>
     </message>
     <message>
         <source>Open Keyboard...</source>
         <translation>Tastatur öffnen...</translation>
     </message>
     <message>
         <source>New from Profile</source>
         <translation>Neu aus Profil</translation>
     </message>
     <message>
         <source>Connection</source>
         <translation>Verbindung</translation>
     </message>
     <message>
         <source>Scripts</source>
         <translation>Skripte</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Kopieren</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Einfügen</translation>
     </message>
     <message>
         <source>Script</source>
         <translation>Skript</translation>
     </message>
     <message>
         <source>&lt;qt&gt;There is no Connection.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Es gibt keine Verbindung.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>History</source>
         <translation>Historie</translation>
     </message>
     <message>
         <source>New Profile</source>
         <translation>Neues Profil</translation>
     </message>
     <message>
         <source>Save Profile</source>
         <translation>Profil speichern</translation>
     </message>
     <message>
         <source>Start log</source>
         <translation>Start Log</translation>
     </message>
     <message>
         <source>Stop log</source>
         <translation>Stop Log</translation>
     </message>
     <message>
         <source>Log</source>
         <translation></translation>
     </message>
 </context>
 <context>
     <name>ModemConfigWidget</name>
     <message>
         <source>Modem is attached to:</source>
         <translation>Modem ist angeschlossen an:</translation>
     </message>
     <message>
         <source>Enter telefon number here:</source>
         <translation>Telefonnummer hier eingeben:</translation>
     </message>
     <message>
         <source>AT commands</source>
         <translation>AT Kommandos</translation>
     </message>
     <message>
         <source>Enter number</source>
         <translation>Nummer</translation>
     </message>
 </context>
 <context>
     <name>NoOptions</name>
     <message>
         <source>This Plugin does not support any configurations</source>
         <translation>Dieser Einschub unterstützt keine Konfiguration</translation>
     </message>
 </context>
 <context>
     <name>ProfileEditorDialog</name>
     <message>
         <source>Connection</source>
         <translation>Verbindung</translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
         <source>Auto connect after load</source>
         <translation>Automatisch verbinden nach dem Laden</translation>
     </message>
     <message>
         <source>Local Console</source>
         <translation>Lokale Konsole</translation>
     </message>
     <message>
         <source>New Profile</source>
         <translation>Neues Profil</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Opie Console</source>
         <translation>Opie Konsole</translation>
     </message>
     <message>
         <source>Failed</source>
         <translation>Fehlgeschlagen</translation>
     </message>
     <message>
         <source>Connecting failed for this session.</source>
         <translation>Verbindung für diese Sitzung fehlgeschlagen.</translation>
     </message>
     <message>
         <source>Session failed</source>
         <translation>Sitzung fehlgeschlagen</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Cannot open session: Not all components were found.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Kann Sitzung nicht öffnen: Nicht alle Komponenten wurden gefunden.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Transfer mode</source>
         <translation>Übertragungsmodus</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Senden</translation>
     </message>
     <message>
         <source>Receive</source>
         <translation>Empfangen</translation>
     </message>
     <message>
         <source>Send file</source>
         <translation>Datei senden</translation>
     </message>
     <message>
         <source>Transfer protocol</source>
         <translation>Übertragungsprotokoll</translation>
     </message>
     <message>
         <source>Progress</source>
         <translation>Fortschritt</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
         <source>Ready</source>
         <translation>Fertig</translation>
     </message>
     <message>
         <source>Start transfer</source>
         <translation>Übertragung starten</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Abbruch</translation>
     </message>
     <message>
         <source>File transfer</source>
         <translation>Dateiübertragung</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation>Achtung</translation>
     </message>
     <message>
         <source>No file has been specified.</source>
         <translation>Es wurde keine Datei angegeben.</translation>
     </message>
     <message>
         <source>Sending...</source>
         <translation>Sende...</translation>
     </message>
     <message>
         <source>Receiving...</source>
         <translation>Empfange...</translation>
     </message>
     <message>
         <source>Cancelled</source>
         <translation>Abgebrochen</translation>
     </message>
     <message>
         <source>The file transfer has been cancelled.</source>
         <translation>Die Dateiübertragung wurde abgebrochen.</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
         <source>Operation not supported.</source>
         <translation>Operation nicht unterstützt.</translation>
     </message>
     <message>
         <source>Transfer could not be started.</source>
         <translation>Übertragung konnte nicht gestartet werden.</translation>
     </message>
     <message>
         <source>No error.</source>
         <translation>Kein Fehler.</translation>
     </message>
     <message>
         <source>Undefined error occured.</source>
         <translation>Undefinierter Fehler aufgetreten.</translation>
     </message>
     <message>
         <source>Incomplete transfer.</source>
         <translation>Unvollständige Übertragung.</translation>
     </message>
     <message>
         <source>Unknown error occured.</source>
         <translation>Unbekannter Fehler aufgetreten.</translation>
     </message>
     <message>
         <source>Sent</source>
         <translation>Gesendet</translation>
     </message>
     <message>
         <source>File has been sent.</source>
         <translation>Datei wurde gesendet.</translation>
     </message>
     <message>
         <source>Received</source>
         <translation>Empfangen</translation>
     </message>
     <message>
         <source>File has been received.</source>
         <translation>Datei wurde empfangen.</translation>
     </message>
     <message>
         <source>Profile name</source>
         <translation>Profilname</translation>
     </message>
     <message>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
         <source>Connection</source>
         <translation>Verbindung</translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
         <source>Special Keys</source>
         <translation>Spezial Einstellungen</translation>
     </message>
     <message>
         <source>Invalid profile</source>
         <translation>Ungültiges Profil</translation>
     </message>
     <message>
         <source>Please enter a profile name.</source>
         <translation>Bitte einen Profilnamen eingeben.</translation>
     </message>
     <message>
         <source>Z-Modem</source>
         <translation>Z-Modem</translation>
     </message>
     <message>
         <source>Y-Modem</source>
         <translation>Y-Modem</translation>
     </message>
     <message>
         <source>X-Modem</source>
         <translation>X-Modem</translation>
     </message>
     <message>
         <source>Serial</source>
         <translation>Seriell</translation>
     </message>
     <message>
         <source>Modem</source>
         <translation>Modem</translation>
     </message>
     <message>
         <source>Local Console</source>
         <translation>Lokale Konsole</translation>
     </message>
     <message>
         <source>Default Terminal</source>
         <translation>Standardterminal</translation>
     </message>
     <message>
         <source>Default Keyboard</source>
         <translation>Standardtastatur</translation>
     </message>
     <message>
         <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>
         <source>Reset speakers</source>
         <translation>Lautsprecher zurücksetzen</translation>
     </message>
     <message>
         <source>Turning off dialtone</source>
         <translation>Schalte Wählton ab</translation>
     </message>
     <message>
         <source>Dial number</source>
         <translation>Wähle Nummer</translation>
     </message>
     <message>
         <source>Line busy, redialing number</source>
         <translation>Besetzt, wähle Nummer erneut</translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation>Verbindung aufgebaut</translation>
     </message>
     <message>
         <source>Dismiss</source>
         <translation>Aufgeben</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Dialing the number failed.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Der Wahlvorgang ist fehlgeschlagen&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Fixing up Embedix</source>
         <translation>Korrigiere Embedix</translation>
     </message>
 </context>
 <context>
     <name>SerialConfigWidget</name>
     <message>
         <source>Device</source>
         <translation>Gerät</translation>
     </message>
 </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>
         <source>Options</source>
         <translation>Optionen</translation>
     </message>
     <message>
         <source>Local echo</source>
         <translation>Lokales Echo</translation>
     </message>
     <message>
         <source>Line wrap</source>
         <translation>Zeilenumbruch</translation>
     </message>
     <message>
         <source>VT 100</source>
         <translation>VT 100</translation>
     </message>
     <message>
         <source>VT 102</source>
         <translation>VT 102</translation>
     </message>
     <message>
         <source>Linux Console</source>
         <translation>Linux Konsole</translation>
     </message>
     <message>
         <source>X-Terminal</source>
         <translation>X-Terminal</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>green on black</source>
         <translation>grün auf schwarz</translation>
     </message>
     <message>
         <source>orange on black</source>
         <translation>orange auf schwarz</translation>
     </message>
 </context>
 </TS>
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
@@ -1,314 +1,330 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BaseSetup</name>
     <message>
         <source> seconds</source>
         <translation>Sekunden</translation>
     </message>
     <message>
         <source>Slideshow timeout:</source>
         <translation>Diashow Auszeit:</translation>
     </message>
     <message>
         <source> pixel</source>
         <translation>Pixel</translation>
     </message>
     <message>
         <source>Size of thumbnails:</source>
         <translation>Größe der Vorschaubilder:</translation>
     </message>
     <message>
         <source>Show toolbar on startup</source>
         <translation>Toolbar beim Starten anzeigen</translation>
     </message>
     <message>
         <source>Save status of fullscreen/autorotate</source>
         <translation>Sichere Zustand von Vollschirm/automatischem Drehen</translation>
     </message>
     <message>
         <source>Default display brightness:</source>
         <translation>Standardmäßige Anzeigehelligkeit:</translation>
     </message>
 </context>
 <context>
     <name>ImageView</name>
     <message>
         <source>View Image Info</source>
         <translation>Zeige Bildinformationen</translation>
     </message>
     <message>
         <source>Toggle autorotate</source>
         <translation>Automatisches Rotieren umschalten</translation>
     </message>
     <message>
         <source>Toggle autoscale</source>
         <translation>Automatisches Skalieren umschalten</translation>
     </message>
     <message>
         <source>Switch to next image</source>
         <translation>Gehe zu nächstem Bild</translation>
     </message>
     <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>
         <source>Delete Current Item</source>
         <translation>Lösche aktuelle Auswahl</translation>
     </message>
     <message>
         <source>View Current Item</source>
         <translation>Betrachte aktuelle Auswahl</translation>
     </message>
     <message>
         <source>Show Image Info</source>
         <translation>Zeige Bildinformationen</translation>
     </message>
     <message>
         <source>Delete Image</source>
         <translation>Lösche Bild</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Bild</translation>
     </message>
     <message>
         <source>Start slideshow</source>
         <translation>Beginne Diashow</translation>
     </message>
     <message>
         <source>the Image</source>
         <translation>das Bild</translation>
     </message>
 </context>
 <context>
     <name>PMainWindow</name>
     <message>
         <source>Browser Keyboard Actions</source>
         <translation>Browser Tastaturaktionen</translation>
     </message>
     <message>
         <source>Keyboard Configuration</source>
         <translation>Tastaturkonfiguration</translation>
     </message>
     <message>
         <source>Opie Eye - Config</source>
         <translation>Opie Eye - Konfiguration</translation>
     </message>
     <message>
         <source>Imageinfo Keyboard Actions</source>
         <translation>Bildinformation Tastaturaktionen</translation>
     </message>
     <message>
         <source>Imageview Keyboard Actions</source>
         <translation>Bildansicht Tastaturaktionen</translation>
     </message>
     <message>
         <source>Go dir up</source>
         <translation>Ein Verzeichnis hochgehen</translation>
     </message>
     <message>
         <source>Beam file</source>
         <translation>Sende Datei</translation>
     </message>
     <message>
         <source>Show imageinfo</source>
         <translation>Zeige Bildinformationen</translation>
     </message>
     <message>
         <source>Delete file</source>
         <translation>Lösche Datei</translation>
     </message>
     <message>
         <source>Display image</source>
         <translation>Zeige Bild</translation>
     </message>
     <message>
         <source>Start slideshow</source>
         <translation>Beginne Diashow</translation>
     </message>
     <message>
         <source>Show toolbar</source>
         <translation>Zeige Toolbar</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
         <source>Thumbnail and Imageinfo</source>
         <translation>Vorschaubild und Bildinformationen</translation>
     </message>
     <message>
         <source>Thumbnail and name</source>
         <translation>Vorschaubild und Name</translation>
     </message>
     <message>
         <source>Name only</source>
         <translation>Ausschliesslich Name</translation>
     </message>
     <message>
         <source>Next image</source>
         <translation>Nächstes Bild</translation>
     </message>
     <message>
         <source>Previous image</source>
         <translation>Vorheriges Bild</translation>
     </message>
     <message>
         <source>Show images fullscreen</source>
         <translation>Zeige Bild Vollbild</translation>
     </message>
     <message>
         <source>Auto rotate images</source>
         <translation>Rotiere Bilder automatisch</translation>
     </message>
     <message>
         <source>Show images unscaled</source>
         <translation>Zeige Bilder unskaliert</translation>
     </message>
     <message>
         <source>Show zoomer window when unscaled</source>
         <translation>Zeige Zoomfenster wenn unskaliert</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>Show</source>
         <translation>Zeige</translation>
     </message>
     <message>
         <source>Select filesystem</source>
         <translation>Wähle Dateisystem</translation>
     </message>
     <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>
         <translation>Zeige alle Dateien</translation>
     </message>
     <message>
         <source>Opie Eye</source>
         <translation>Opie Eye</translation>
     </message>
     <message>
         <source>DocView</source>
         <translation>Dokumentenansicht</translation>
     </message>
     <message>
         <source>Directory View</source>
         <translation>Verzeichnisansicht</translation>
     </message>
     <message>
         <source>&lt;center&gt;&lt;b&gt;Be carefull with the following options!&lt;/b&gt;&lt;/center&gt;</source>
         <translation>&lt;center&gt;&lt;b&gt;Seien Sie vorsichtig mit der folgenden Option!&lt;/b&gt;&lt;/center&gt;</translation>
     </message>
     <message>
         <source>Show files recursive</source>
         <translation>Zeige Dateien rekursiv</translation>
     </message>
     <message>
         <source>Recursion depth:</source>
         <translation>Rekursionstiefe:</translation>
     </message>
     <message>
         <source> directories</source>
         <translation>Verzeichnisse</translation>
     </message>
     <message>
         <source>Digital Camera View</source>
         <translation>Digitale Kamera Ansicht</translation>
     </message>
     <message>
         <source>Error no Camera Dir found</source>
         <translation>Fehler kein Kameraverzeichnis gefunden</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;Möchten Sie wirklich %1 löschen&lt;br&gt;%2?&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Confirm Deletion</source>
         <translation>Löschen bestätigen</translation>
     </message>
     <message>
         <source>Display brightness:</source>
         <translation>Anzeigehelligkeit:</translation>
     </message>
 </context>
 <context>
     <name>ViewModeButton</name>
     <message>
         <source>Thumbnail and Imageinfo</source>
         <translation>Vorschaubild und Bildinformation</translation>
     </message>
     <message>
         <source>Thumbnail and Name</source>
         <translation>Vorschaubild und Name</translation>
     </message>
     <message>
         <source>Name Only</source>
         <translation>ausschliesslich Name</translation>
     </message>
 </context>
 <context>
     <name>imageinfo</name>
     <message>
         <source>View Full Image</source>
         <translation>Zeige vollständiges Bild</translation>
     </message>
     <message>
         <source>Image info</source>
         <translation>Bildinformationen</translation>
     </message>
     <message>
         <source>Displays an thumbnail of the image</source>
         <translation>Zeigt ein Vorschaubild des Bildes</translation>
     </message>
     <message>
         <source>Displays info of selected image</source>
         <translation>Zeigt Informationen über das gewählte Bild</translation>
     </message>
 </context>
 </TS>
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,153 +1,127 @@
 <!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>
         <source>User</source>
         <translation>Benutzer</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Suspend</source>
         <translation>Ausschalten</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Menü</translation>
     </message>
 </context>
 <context>
     <name>LoginWindowImpl</name>
     <message>
         <source>Restart</source>
         <translation>Neustart</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>Beenden</translation>
     </message>
     <message>
-        <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
-        <translation 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>
     <message>
         <source>&lt;b&gt;Password:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Passwort:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Confirm:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Bestätigen:&lt;/b</translation>
     </message>
 </context>
 <context>
     <name>PasswordDialogImpl</name>
     <message>
         <source>Trying to leave without password set</source>
         <translation>Versuch ohne gesetztes Passwort zu beenden</translation>
     </message>
     <message>
         <source>&lt;qt&gt;No password was set. This could lead to you not beeingable to remotely connect to your machine.Do you want to continue not setting a password?&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Es war kein Passwort eingestellt. Dies kann dazu führen, dass Sie sich nicht von einem anderen Rechner auf den PDA einloggen können. Dennoch kein Passwort setzen?&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Passwords don&apos;t match</source>
         <translation>Passwörter nicht identisch</translation>
     </message>
     <message>
         <source>&lt;qt&gt;The two passwords don&apos;t match. Please try again.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Die Passwörter stimmen nicht überein.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Password not legal</source>
         <translation>Passwort ungültig</translation>
     </message>
     <message>
         <source>&lt;qt&gt;The entered password is not a valid password.Please try entering a valid password.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Das eingegebene Passwort ist ungültig&lt;/qt&gt;</translation>
     </message>
 </context>
 </TS>
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
@@ -1,756 +1,724 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>DCCProgress</name>
     <message>
         <source>Receiving file %1 from %2...</source>
         <translation>Empfange Datei %1 von %2...</translation>
     </message>
     <message>
         <source>Successfully received %1</source>
         <translation>Erfolgreich %1 empfangen</translation>
     </message>
     <message>
         <source>Aborted</source>
         <translation>Abgebrochen</translation>
     </message>
     <message>
         <source>Peer Aborted</source>
         <translation>Gegenstelle hat abgebrochen</translation>
     </message>
     <message>
         <source>Timeout</source>
         <translation></translation>
     </message>
 </context>
 <context>
     <name>DCCTransferTab</name>
     <message>
         <source>DCC Transfers in Progress</source>
         <translation>Laufende DDC Übertragungen</translation>
     </message>
     <message>
         <source>There are transfers in progress. &lt;br&gt;If you close this tab, they will be canceled.&lt;br&gt;Do you want to close it anyway?</source>
         <translation>Es sind Übertragungen im Gange.&lt;br&gt;Wenn Sie dieses Tab schliessen werden diese abgebrochen.&lt;br&gt;Trotzdem beenden?</translation>
     </message>
     <message>
         <source>&amp;Close</source>
         <translation>&amp;Schliessen</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Close</source>
         <translation>&amp;Nicht schliessen</translation>
     </message>
     <message>
         <source>DCC Transfer from %1</source>
         <translation>DDC Übertragung von %1</translation>
     </message>
     <message>
         <source>%1 is trying to send you the file %2
 (%3 bytes)</source>
         <translation>%1 versucht Ihnen die Datei %2
 (%3 bytes) zu senden</translation>
     </message>
     <message>
         <source>&amp;Accept</source>
         <translation>A&amp;nnehmen</translation>
     </message>
     <message>
         <source>&amp;Reject</source>
         <translation>&amp;Ablehnen</translation>
     </message>
 </context>
 <context>
     <name>IRCChannelTab</name>
     <message>
         <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>
         <source>Whois</source>
         <translation>WerIst</translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation>Verbindungsabbruch</translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
         <translation>Verbunden, melde mich an..</translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
         <translation>Erfolgreich angemeldet.</translation>
     </message>
     <message>
         <source>Socket error : </source>
         <translation>Socket Fehler:</translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation>Verbindung geschlossen</translation>
     </message>
 </context>
 <context>
     <name>IRCHistoryLineEdit</name>
     <message>
         <source>Next Tab</source>
         <translation>Nächstes Tab</translation>
     </message>
     <message>
         <source>Previous Tab</source>
         <translation>Vorheriges Tab</translation>
     </message>
     <message>
         <source>Close Tab</source>
         <translation>Tab schliessen</translation>
     </message>
 </context>
 <context>
     <name>IRCMessageParser</name>
     <message>
         <source>Nonexistant channel join - desynchronized?</source>
         <translation>Beitritt zu nicht existierenden Kanal - unsynchronisiert?</translation>
     </message>
     <message>
         <source>Person has already joined the channel - desynchronized?</source>
         <translation>Person Kanal bereits beigetreten - unsynchronisiert?</translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
         <translation>Du bist dem Kanal bereits beigetreten - unsynchronisiert?</translation>
     </message>
     <message>
         <source>Parting person not found - desynchronized?</source>
         <translation>Scheidende Person nicht gefunden - unsynchronisiert?</translation>
     </message>
     <message>
         <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>
         <source>Mode change has unknown type</source>
         <translation>Moduswechsel hat einen unbekannten Typ</translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
         <translation>Moduswechsel mit unbekannter Person - unsynchronisiert?</translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
         <translation>Moduswechsel hat ein unbekanntes Flag</translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
         <translation>Moduswechsel mit unbekanntem Kanal - unsynchronisiert?</translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
         <translation>Benutzermodi noch nicht unterstützt</translation>
     </message>
     <message>
         <source>You were kicked from </source>
         <translation>Du bist rausgeworfen worden aus</translation>
     </message>
     <message>
         <source> by </source>
         <translation>von</translation>
     </message>
     <message>
         <source> was kicked from </source>
         <translation>wurde rausgeworfen aus</translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
         <translation>Unbekannte Person rausgeworfen - unsynchronisiert?</translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
         <translation>Unbekannter Kanal rausgeworfen - unsynchronisiert?</translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
         <translation>Servernachricht mit unbekanntem Kanal</translation>
     </message>
     <message>
         <source>You joined channel </source>
         <translation>Du bist folgendem Kanal beigetreten</translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
         <translation>Spitzname bereits vergeben, bitte mit einem anderen neu verbinden</translation>
     </message>
     <message>
         <source>No such nickname</source>
         <translation>Es gibt keinen solchen Spitznamen</translation>
     </message>
     <message>
         <source>Received unhandled numeric command: %1</source>
         <translation>Unbehandeltes numerisches Kommando erhalten: %1</translation>
     </message>
     <message>
         <source>Received unhandled ctcp command: %1</source>
         <translation>Unbehandeltes ctcp Kommando erhalten: %1</translation>
     </message>
     <message>
         <source>Received unhandled literal command: %1</source>
         <translation>Unbehandeltes buchstäbliches Kommando erhalten: %1</translation>
     </message>
     <message>
         <source>%1 joined channel %2</source>
         <translation>%1 betrat Kanal %2</translation>
     </message>
     <message>
         <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>
         <source>There are %1 unknown connection(s)</source>
         <translation>Es gibt %1 unbekannte Verbindungen</translation>
     </message>
     <message>
         <source>There are %1 channels formed</source>
         <translation>Es gibt %1 Channels</translation>
     </message>
     <message>
         <source>Please wait a while and try again</source>
         <translation>Bitte warten Sie eine Weile und versuchen Sie es erneut</translation>
     </message>
     <message>
         <source>Whois %1 (%2@%3)
 Real name: %4</source>
         <translation>Whois %1 (%2@%3)
 Name: %4</translation>
     </message>
     <message>
         <source>%1 is using server %2</source>
         <translation>%1 verwendet Server %2</translation>
     </message>
     <message>
         <source>%1 is on channels: %2</source>
         <translation>%1 ist in den Channels: %2</translation>
     </message>
     <message>
         <source>Names for %1: %2</source>
         <translation>Namen für %1: %2</translation>
     </message>
     <message>
         <source>Time on server %1 is %2</source>
         <translation>Die Zeit auf Server %1 ist %2</translation>
     </message>
     <message>
         <source>Channel or nick %1 doesn&apos;t exists</source>
         <translation>Channel oder Nick %1 gibt es nicht</translation>
     </message>
     <message>
         <source>There is no history information for %1</source>
         <translation>Keine Historie für %1 vorhanden</translation>
     </message>
     <message>
         <source>Unknown command: %1</source>
         <translation>Unbekannter Befehl: %1</translation>
     </message>
     <message>
         <source>Can&apos;t change nick to %1: %2</source>
         <translation>Konnte Nick nicht ändern auf %1:%2</translation>
     </message>
     <message>
         <source>You&apos;re not on channel %1</source>
         <translation>Sie sind nicht im Channel %1</translation>
     </message>
     <message>
         <source>[%1] Operation not permitted, you don&apos;t have enough channel privileges</source>
         <translation>[%1] nicht erlaubt. Sie haben nicht die nötigen Privilegien</translation>
     </message>
     <message>
         <source>Connected to</source>
         <translation>Verbunden mit</translation>
     </message>
     <message>
         <source>%1 has been idle for %2</source>
         <translation>%1 ist Idle seit %2</translation>
     </message>
     <message>
         <source>%1 signed on %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP PING with unknown person - Desynchronized?</source>
         <translation>CTCP PING von unbekannter Person - Netzprobleme?</translation>
     </message>
     <message>
         <source>CTCP PING with unknown channel - Desynchronized?</source>
         <translation>CTCP PING mit ungültigem Channel - Netzprobleme?</translation>
     </message>
     <message>
         <source>CTCP PING with bad recipient</source>
         <translation>CTCP PING mit ungültigem Empfänger</translation>
     </message>
     <message>
         <source>Received a CTCP VERSION request from </source>
         <translation>CTCP VERSION Anfrage erhalten von</translation>
     </message>
     <message>
         <source>Received a CTCP PING reply from %1: %2 seconds</source>
         <translation>CTCP PING Antwort von %1: %2 Sekunden</translation>
     </message>
     <message>
         <source>Received a CTCP PING request from %1</source>
         <translation>CTCP PING von %1 empfangen</translation>
     </message>
     <message>
         <source>Malformed DCC request from %1</source>
         <translation>Fehlerhafte DDC Anfrage von %1</translation>
     </message>
     <message>
         <source>Save As</source>
         <translation>Speichern als</translation>
     </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
         <translation>Spreche zu</translation>
     </message>
     <message>
         <source>Private discussion</source>
         <translation>Private Diskussion</translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
         <translation>Geben Sie Ihren Text hier ein, um eine Nachricht an die andere Person zu schicken</translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation>Verbindung getrennt</translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
         <translation>Profilname:</translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
         <translation>Der Name dieses Serverprofils im Überblick</translation>
     </message>
     <message>
         <source>Hostname :</source>
         <translation>Hostname:</translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
         <translation>Servername, mit dem verbunden werden soll - kann ein gültiger Hostname oder eine IP Adresse sein</translation>
     </message>
     <message>
         <source>Port :</source>
         <translation>Port:</translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
         <translation>Der Serverport, mit dem verbunden werden soll. Normaler Weise 6667</translation>
     </message>
     <message>
         <source>Nickname :</source>
         <translation>Spitzname:</translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
         <translation>Dein Spitzname im IRC Netzwerk</translation>
     </message>
     <message>
         <source>Realname :</source>
         <translation>Echter Name:</translation>
     </message>
     <message>
         <source>Your real name</source>
         <translation>Dein echter Name</translation>
     </message>
     <message>
         <source>Password :</source>
         <translation>Passwort:</translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
         <translation>Passwort, um mit dem Server zu verbinden (wenn benötigt)</translation>
     </message>
     <message>
         <source>Channels :</source>
         <translation>Kanäle:</translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
         <translation>Komma-separierte Liste aller Kanäle, denen Du automatisch beitreten möchtest</translation>
     </message>
     <message>
         <source>Edit server information</source>
         <translation>Server Information bearbeiten</translation>
     </message>
     <message>
         <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>
         <translation>Serverliste</translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
         <translation>Bitte wähle ein Serverprofil</translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
         <translation>Bitte Serverprofil aus der Liste auswählen, dann OK oben rechts anklicken</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Bearbeiten</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Hinzufügen</translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
         <translation>Das aktuell gewählte Serverprofil löschen</translation>
     </message>
     <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>
 <context>
     <name>IRCSession</name>
     <message>
         <source>You are now known as %1</source>
         <translation>Du bis nun als %1 bekannt</translation>
     </message>
     <message>
         <source>Nickname change of an unknown person</source>
         <translation>Spitznamen Änderung einer unbekannten Person</translation>
     </message>
     <message>
         <source>%1 is now known as %2</source>
         <translation>%1 ist nun bekannt als %2</translation>
     </message>
 </context>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Lines displayed :</source>
         <translation>Dargestellte Zeilen:</translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
         <translation>Zeilenanzahl, die dargestellt werden bevor alte Zeilen gelöscht werden - dies ist nötig um den Speicherverbrauch zu begrenzen. Setze 0, wenn Du das nicht brauchst</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Generell</translation>
     </message>
     <message>
         <source>Background color :</source>
         <translation>Hintergrundsfarbe :</translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
         <translation>Im Chat benutzte Hintergrundsfarbe</translation>
     </message>
     <message>
         <source>Normal text color :</source>
         <translation>Normale Textfarbe:</translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
         <translation>Im Chat benutzte Textfarbe</translation>
     </message>
     <message>
         <source>Error color :</source>
         <translation>Fehler Farbe:</translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
         <translation>Textfarbe, die benutzt wird, um Fehlermeldungen darzustellen</translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
         <translation>Von Dir geschriebener Text:</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
         <translation>Textfarbe, die von Dir geschriebenen Text identifiziert</translation>
     </message>
     <message>
         <source>Text written by others :</source>
         <translation>Von anderen geschriebener Text:</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
         <translation>Textfarbe, die von anderen geschriebenen Text identifiziert</translation>
     </message>
     <message>
         <source>Text written by the server :</source>
         <translation>Vom Server geschriebener Text:</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
         <translation>Textfarbe, die vom Server geschriebenen Text identifiziert</translation>
     </message>
     <message>
         <source>Notifications :</source>
         <translation>Benachrichtigungen:</translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
         <translation>Textfarbe, die benutzt wird, um Benachrichtigungen darzustellen</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Farben</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
         <source>Display time in chat log</source>
         <translation>Zeit im Logfile anzeigen</translation>
     </message>
     <message>
         <source>Keyboard Shortcuts</source>
         <translation>Tastaturabkürzungen</translation>
     </message>
 </context>
 <context>
     <name>IRCTab</name>
     <message>
         <source>Missing description</source>
         <translation>Fehlende Beschreibung</translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
         <translation>Inhaltsbeschreibung dieses Reiters</translation>
     </message>
     <message>
         <source>Close this tab</source>
         <translation>Reiter schließen</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
         <translation>IRC Anwendung</translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
         <translation>Serververbindungen, Kanäle, Gespräche und andere Sachen werden hier sein</translation>
     </message>
     <message>
         <source>IRC</source>
         <translation>IRC</translation>
     </message>
     <message>
         <source>New connection</source>
         <translation>Neue Verbindung</translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
         <translation>Erstelle eine neue Verbindung zu einem IRC-Server</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
         <translation>Konfiguriere OpieIRC&apos;s Verhalten und Aussehen</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source> User</source>
         <translation></translation>
     </message>
     <message>
         <source>Opie IRC</source>
         <translation></translation>
     </message>
     <message>
         <source> gives channel operator status to </source>
         <translation>gibt Channel Operator Status an</translation>
     </message>
     <message>
         <source> removes channel operator status from </source>
         <translation>entfernt Channel Operator Status von</translation>
     </message>
     <message>
         <source> gives voice to </source>
         <translation>gibt Voice an</translation>
     </message>
     <message>
         <source> removes voice from </source>
         <translation>entfernt Voice von</translation>
     </message>
 </context>
 </TS>
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,1227 +1,881 @@
 <!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>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation>Es sind keine Einträge im Adressbuch.</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Sie müssen mindestens eine Adresse auswählen.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
 </context>
 <context>
     <name>AddressPickerUI</name>
     <message>
         <source>Address Picker</source>
         <translation>Adressenauswahl</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
 </context>
 <context>
     <name>ComposeMail</name>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>Problem</source>
         <translation>Problem</translation>
     </message>
     <message>
         <source>&lt;p&gt;Please create an SMTP account first.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Bitte zuerst einen SMTP-Zugange erstellen.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a File.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Bitte wählen Sie eine Datei.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Sending mail</source>
         <translation>Versende Mail</translation>
     </message>
     <message>
         <source>Store message</source>
         <translation>Speichere Nachricht</translation>
     </message>
     <message>
         <source>Store message into drafts?</source>
         <translation>Speichere Nachricht nach Drafts?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nein</translation>
     </message>
     <message>
         <source>&lt;center&gt;Attachments will not be stored in &quot;Draft&quot; folder&lt;/center&gt;</source>
         <translation>&lt;center&gt;Anhänge werden nicht im &quot;Draft&quot;-Verzeichnis gesichert.&lt;/center&gt;</translation>
     </message>
     <message>
         <source>No Receiver specified</source>
         <translation>Kein Empfänger angegeben</translation>
     </message>
 </context>
 <context>
     <name>ComposeMailUI</name>
     <message>
         <source>Compose Message</source>
         <translation>Verfasse Nachricht</translation>
     </message>
     <message>
         <source>send later</source>
         <translation>Versende später</translation>
     </message>
     <message>
         <source>use:</source>
         <translation>nutze:</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Post</translation>
     </message>
     <message>
         <source>Subject</source>
         <translation>Betreff</translation>
     </message>
     <message>
         <source>From</source>
         <translation>Von</translation>
     </message>
     <message>
         <source>To</source>
         <translation>An</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Optionen</translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation>Antwort an</translation>
     </message>
     <message>
         <source>BCC</source>
         <translation>BCC</translation>
     </message>
     <message>
         <source>Signature</source>
         <translation>Signatur</translation>
     </message>
     <message>
         <source>CC</source>
         <translation>CC</translation>
     </message>
     <message>
         <source>Attachment</source>
         <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>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete the selected Account?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Möchten Sie wirlich den ausgewählten Zugang löschen?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nein</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select an account.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Bitte wählen Sie einen Zugang.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation></translation>
     </message>
 </context>
 <context>
     <name>EditAccountsUI</name>
     <message>
         <source>Configure Accounts</source>
         <translation>Konfiguriere Zugänge</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Post</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Name des Zugangs</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Bearbeite</translation>
     </message>
     <message>
         <source>News</source>
         <translation>News</translation>
     </message>
 </context>
 <context>
     <name>IMAPconfigUI</name>
     <message>
         <source>Configure IMAP</source>
         <translation>Konfiguriere IMAP</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Benutzer</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Name des Kontos</translation>
     </message>
     <message>
         <source>Account</source>
         <translation>Konto</translation>
     </message>
     <message>
         <source>Prefix</source>
         <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>
     </message>
     <message>
         <source>Send queued mails</source>
         <translation>Sende wartende Post</translation>
     </message>
     <message>
         <source>Show/Hide folders</source>
         <translation>Zeige/Verstecke Ordner</translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation>Lösche Post</translation>
     </message>
     <message>
         <source>Edit settings</source>
         <translation>Bearbeite Einstellungen</translation>
     </message>
     <message>
         <source>Configure accounts</source>
         <translation>Konfiguriere Konten</translation>
     </message>
     <message>
         <source>Mailbox</source>
         <translation>Mailbox</translation>
     </message>
     <message>
         <source>Subject</source>
         <translation>Betreff</translation>
     </message>
     <message>
         <source>Sender</source>
         <translation>Absender</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
         <source>Folder</source>
         <translation>Ordner</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>Trenne</translation>
     </message>
     <message>
         <source>Set on/offline</source>
         <translation>On/Offline setzen</translation>
     </message>
     <message>
         <source>Refresh folder list</source>
         <translation>Erneuere Ordnerliste</translation>
     </message>
     <message>
         <source>Create new folder</source>
         <translation>Erstelle neuen Ordner</translation>
     </message>
     <message>
         <source>(Un-)Subscribe groups</source>
         <translation>Abboniere Gruppen</translation>
     </message>
     <message>
         <source>Refresh headerlist</source>
         <translation>Erneuere Nachrichtenliste</translation>
     </message>
     <message>
         <source>Delete all mails</source>
         <translation>Lösche alle Nachrichten</translation>
     </message>
     <message>
         <source>New subfolder</source>
         <translation>Neuer Unterordner</translation>
     </message>
     <message>
         <source>Delete folder</source>
         <translation>Lösche Ordner</translation>
     </message>
     <message>
         <source>Move/Copie all mails</source>
         <translation>Bewege/Kopiere alle Nachrichten</translation>
     </message>
     <message>
         <source>Read current mail</source>
         <translation>Lese aktuelle Nachricht</translation>
     </message>
 </context>
 <context>
     <name>NNTPGroupsDlg</name>
     <message>
         <source>Subscribed newsgroups</source>
         <translation>Abbonierte Newsgruppen</translation>
     </message>
 </context>
 <context>
     <name>NNTPGroupsUI</name>
     <message>
         <source>newsgroupslist</source>
         <translation>Newsgruppenliste</translation>
     </message>
     <message>
         <source>Newsgroups</source>
         <translation>Newsgruppen</translation>
     </message>
     <message>
         <source>List of groups from the server. On start, only subscribed groups are listed.</source>
         <translation>Liste der Gruppen des Servers. Zu Beginn sind nur abonnierte Gruppen gelisteted.</translation>
     </message>
     <message>
         <source>Groupfilter:</source>
         <translation>Gruppenfilter:</translation>
     </message>
     <message>
         <source>Get newsgroup list from server</source>
         <translation>Hole Newsgruppenliste vom Server</translation>
     </message>
     <message>
         <source>Retrieve the list of groups from server</source>
         <translation>Empange die Gruppenliste vom Server</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>Geben Sie hier einen Filter ein.
 Danach wird beim holen der Gruppenliste dieser Filter
 verwendet.</translation>
     </message>
 </context>
 <context>
     <name>NNTPconfigUI</name>
     <message>
         <source>Configure NNTP</source>
         <translation>Konfiguriere NNTP</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Name des Kontos</translation>
     </message>
     <message>
         <source>Account</source>
         <translation>Konto</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
         <source>Use SSL</source>
         <translation>Benutze SSL</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Benutzer</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Use Login</source>
         <translation>Benutze Login</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Gruppen</translation>
     </message>
     <message>
         <source>Newsgroup</source>
         <translation>Newsgruppe</translation>
     </message>
     <message>
         <source>Get newsgroup list from server</source>
         <translation>Hole Newsgruppenliste vom Server</translation>
     </message>
 </context>
 <context>
     <name>Newmdirdlgui</name>
     <message>
         <source>Enter directory name</source>
         <translation>Gebe Verzeichnisname ein</translation>
     </message>
     <message>
         <source>Directory name:</source>
         <translation>Verzeichnisname:</translation>
     </message>
     <message>
         <source>Directory contains other subdirs</source>
         <translation>Verzeichnis enthält Unterverzeichnisse</translation>
     </message>
 </context>
 <context>
     <name>OpieMail</name>
     <message>
         <source>Info</source>
         <translation>Information</translation>
     </message>
     <message>
         <source>Mail queue flushed</source>
         <translation>Nachrichtenwarteschlange geleert</translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation>Lösche Nachricht</translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation>&lt;p&gt;Möchten sie wirlich diese Nachricht löschen?&lt;br&gt;&lt;br&gt;</translation>
     </message>
     <message>
         <source>Read this mail</source>
         <translation>Lese diese Nachricht</translation>
     </message>
     <message>
         <source>Delete this mail</source>
         <translation>Lösche diese Nachricht</translation>
     </message>
     <message>
         <source>Copy/Move this mail</source>
         <translation>Kopiere/Bewege diese Nachricht</translation>
     </message>
     <message>
         <source>Error creating new Folder</source>
         <translation>Fehler beim Erstellen des neuen Verzeichnisses</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>
     <message>
         <source>Define a smtp account first</source>
         <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>
     </message>
     <message>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation>Benutze sichere Verbindung:</translation>
     </message>
     <message>
         <source>ssh $SERVER exec imapd</source>
         <translation></translation>
     </message>
     <message>
         <source>User</source>
         <translation>Benutzer</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>ask before downloading large mails</source>
         <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>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Name des Kontos</translation>
     </message>
     <message>
         <source>Name of the SMTP Server</source>
         <translation>Name des SMTP Server</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
         <source>Port of the SMTP Server</source>
         <translation>Port des SMTP-Server</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Benutzer</translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation>Benutze sichere Verbindung:</translation>
     </message>
     <message>
         <source>ssh $SERVER exec</source>
         <translation></translation>
     </message>
 </context>
 <context>
     <name>SelectMailTypeUI</name>
     <message>
         <source>Select Type</source>
         <translation>Wähle Typ</translation>
     </message>
     <message>
         <source>Select Account Type</source>
         <translation>Wähle Kontotyp</translation>
     </message>
     <message>
         <source>IMAP</source>
         <translation></translation>
     </message>
     <message>
         <source>POP3</source>
         <translation></translation>
     </message>
     <message>
         <source>SMTP</source>
         <translation></translation>
     </message>
 </context>
 <context>
     <name>SettingsDialogUI</name>
     <message>
         <source>Settings Dialog</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
         <source>View Mail</source>
         <translation>Betrachte Nachricht</translation>
     </message>
     <message>
         <source>View mail as Html</source>
         <translation>Betrachte Nachrichten als HTML</translation>
     </message>
     <message>
         <source>Compose Mail</source>
         <translation>Erstelle Nachricht</translation>
     </message>
     <message>
         <source>Send mails later ( enqueue in outbox )</source>
         <translation>Versende Nachrichten später (reihe in Outbox ein)</translation>
     </message>
     <message>
         <source>Taskbar Applet</source>
         <translation>Taskbar Applet</translation>
     </message>
     <message>
         <source>Disable Taskbar Applet</source>
         <translation>Deaktivere Taskbar Applet</translation>
     </message>
     <message>
         <source> min</source>
         <translation>min</translation>
     </message>
     <message>
         <source>Check how often</source>
         <translation>Überprüfe wie oft</translation>
     </message>
     <message>
         <source>Blink Led when new mails arrive</source>
         <translation>Ledblinken wenn neue Nachrichten eintreffen</translation>
     </message>
     <message>
         <source>Play Sound when new mails arrive</source>
         <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>
     </message>
     <message>
         <source>To</source>
         <translation>An</translation>
     </message>
     <message>
         <source>Cc</source>
         <translation>Cc</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot reply yet.</source>
         <translation>&lt;p&gt; Der Nachrichtenkörper ist noch nicht geladen, somit können sie noch nicht antworten.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot forward yet.</source>
         <translation>&lt;p&gt;Der Nachrichtenkörper ist noch nicht geladen, somit können Sie noch nicht weiterleiten.</translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation>Lösche Nachricht</translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation>&lt;p&gt;Möchten Sie wirklich diese Nachricht löschen?&lt;br&gt;&lt;br&gt;</translation>
     </message>
     <message>
         <source>Display image preview</source>
         <translation>Zeige Bildvorschau</translation>
     </message>
     <message>
         <source>E-Mail by %1</source>
         <translation>E-Mail von %1</translation>
     </message>
     <message>
         <source>Reading attachment</source>
         <translation>Lese Anhang</translation>
     </message>
     <message>
         <source>Could not read content of attachment</source>
         <translation>Konnte den Inhalt vom Anhang nicht lesen</translation>
     </message>
 </context>
 <context>
     <name>ViewMailBase</name>
     <message>
         <source>Mail</source>
         <translation>Post</translation>
     </message>
     <message>
         <source>Reply</source>
         <translation>Antwort</translation>
     </message>
     <message>
         <source>Forward</source>
         <translation>Weiterleiten</translation>
     </message>
     <message>
         <source>Attachments</source>
         <translation>Anhänge</translation>
     </message>
     <message>
         <source>Show Html</source>
         <translation>Zeige HTML</translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation>Lösche Nachricht</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Beschreibung</translation>
     </message>
     <message>
         <source>Filename</source>
         <translation>Dateiname</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>E-Mail view</source>
         <translation>E-Mail Ansicht</translation>
     </message>
     <message>
         <source>Show image preview inline</source>
         <translation>Zeige eingebettete Bildvorschau</translation>
     </message>
 </context>
 <context>
     <name>selectsmtp</name>
     <message>
         <source>Select SMTP Account</source>
         <translation>Wähle SMTP-Konto</translation>
     </message>
 </context>
 <context>
     <name>selectstoreui</name>
     <message>
         <source>Select target box</source>
         <translation>Wähle Zielordner</translation>
     </message>
     <message>
         <source>&lt;b&gt;Store mail(s) to&lt;/b&gt;</source>
         <translation>&lt;b&gt;Sichere Nachricht(en) nach&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Folder:</source>
         <translation>Ordner:</translation>
     </message>
     <message>
         <source>Account:</source>
         <translation>Konto:</translation>
     </message>
     <message>
         <source>Create new folder</source>
         <translation>Erstelle neuen Ordner</translation>
     </message>
     <message>
         <source>Prefix will prepend, no need to enter it!</source>
         <translation>Präfix wird vorangestellt, nicht nötig ihn einzugeben!</translation>
     </message>
     <message>
         <source>Move mail(s)</source>
         <translation>Bewege Nachricht(en)</translation>
     </message>
 </context>
 </TS>
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
@@ -1,233 +1,155 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>HelpWindow</name>
     <message>
         <source>Backward</source>
         <translation>Rückwärts</translation>
     </message>
     <message>
         <source>Forward</source>
         <translation>Vorwärts</translation>
     </message>
 </context>
 <context>
     <name>QtRec</name>
     <message>
         <source>OpieRecord </source>
         <translation>OpieRecord</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <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>
         <source>Volume</source>
         <translation>Lautstärke</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <source>Send with Ir</source>
         <translation>Über IR senden</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Umbenennen</translation>
     </message>
     <message>
         <source>Ir Beam out</source>
         <translation>IR Übertragung</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>IR übertragen.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
-        <source>Rec</source>
-        <translation 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>
 </TS>
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,168 +1,128 @@
 <!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>
         <source>Options</source>
         <translation>Optionen</translation>
     </message>
     <message>
         <source>Enter your search terms here</source>
         <translation>Gebe den zu suchenden Begriff hier ein</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Anwendungen</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Dokumente</translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation>Aufgaben</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Termine</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Adressbuch</translation>
     </message>
     <message>
         <source>Search for: </source>
         <translation>Suchen nach:</translation>
     </message>
     <message>
         <source>Case sensitive</source>
         <translation>Groß-/Kleinschreibung beachten</translation>
     </message>
 </context>
 <context>
     <name>OListView</name>
     <message>
         <source>Results</source>
         <translation>Resultate</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>show</source>
         <translation>Zeige</translation>
     </message>
     <message>
         <source>edit</source>
         <translation>Bearbeiten</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>Ausführen</translation>
     </message>
     <message>
         <source>open in filemanager</source>
         <translation>Im Dateimanager öffnen</translation>
     </message>
     <message>
         <source>open with </source>
         <translation>Öffnen mit</translation>
     </message>
     <message>
-        <source>show completed tasks</source>
-        <translation 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>
         <source>Search in dates</source>
         <translation>In den Terminen suchen</translation>
     </message>
     <message>
         <source>Search content</source>
         <translation>Inhalt durchsuchen</translation>
     </message>
 </context>
 </TS>
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
@@ -1,452 +1,440 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>CalcDlg</name>
     <message>
         <source>Calculate</source>
         <translation>Berechnungen</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Molecular Weight</source>
         <translation>Molekulargewicht</translation>
     </message>
     <message>
         <source>Chemical Formula</source>
         <translation>Chemische Formel</translation>
     </message>
     <message>
         <source>Molecular Weight (u):</source>
         <translation>Molekulargewicht (u):</translation>
     </message>
     <message>
         <source>Elemental Composition (%):</source>
         <translation>elementare Zusammensetzung (%):</translation>
     </message>
     <message>
         <source>CalcDlg</source>
         <translation></translation>
     </message>
 </context>
 <context>
     <name>OxydataWidget</name>
     <message>
         <source>Block</source>
         <translation>Block</translation>
     </message>
     <message>
         <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>
         <source>%1 pm</source>
         <translation>%1 pm</translation>
     </message>
     <message>
         <source>%1 g/cm^3</source>
         <translation>%1 g/cm^3</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation>Gewicht</translation>
     </message>
     <message>
         <source>Ionization Energy</source>
         <translation>Ionosationsenergie</translation>
     </message>
     <message>
         <source>Boiling point</source>
         <translation>Siedepunkt</translation>
     </message>
     <message>
         <source>Melting point</source>
         <translation>Schmelzpunkt</translation>
     </message>
 </context>
 <context>
     <name>Oxygen</name>
     <message>
         <source>Oxygen</source>
         <translation>Oxygen</translation>
     </message>
     <message>
         <source>PSE</source>
         <translation>PSE</translation>
     </message>
     <message>
         <source>Data</source>
         <translation>Daten</translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation>Berechnungen</translation>
     </message>
     <message>
         <source>Hydrogen</source>
         <translation>Wasserstoff</translation>
     </message>
     <message>
         <source>Helium</source>
         <translation>Helium</translation>
     </message>
     <message>
         <source>Lithium</source>
         <translation>Lithium</translation>
     </message>
     <message>
         <source>Beryllium</source>
         <translation>Beryllium</translation>
     </message>
     <message>
         <source>Boron</source>
         <translation>Bor</translation>
     </message>
     <message>
         <source>Carbon</source>
         <translation>Kohlenstoff</translation>
     </message>
     <message>
         <source>Nitrogen</source>
         <translation>Stickstoff</translation>
     </message>
     <message>
         <source>Fluorine</source>
         <translation>Flour</translation>
     </message>
     <message>
         <source>Neon</source>
         <translation>Neon</translation>
     </message>
     <message>
         <source>Sodium</source>
         <translation>Natrium</translation>
     </message>
     <message>
         <source>Magnesium</source>
         <translation>Magnesium</translation>
     </message>
     <message>
         <source>Aluminum</source>
         <translation>Aluminum</translation>
     </message>
     <message>
         <source>Silicon</source>
         <translation>Silizium</translation>
     </message>
     <message>
         <source>Phosphorus</source>
         <translation>Phospor</translation>
     </message>
     <message>
         <source>Sulfur</source>
         <translation>Schwefel</translation>
     </message>
     <message>
         <source>Chlorine</source>
         <translation>Chlor</translation>
     </message>
     <message>
         <source>Argon</source>
         <translation>Argon</translation>
     </message>
     <message>
         <source>Potassium</source>
         <translation>Kalium</translation>
     </message>
     <message>
         <source>Calcium</source>
         <translation>Kalzium</translation>
     </message>
     <message>
         <source>Scandium</source>
         <translation>Scandium</translation>
     </message>
     <message>
         <source>Titanium</source>
         <translation>Titan</translation>
     </message>
     <message>
         <source>Vanadium</source>
         <translation>Vanadium</translation>
     </message>
     <message>
         <source>Chromium</source>
         <translation>Chrom</translation>
     </message>
     <message>
         <source>Manganese</source>
         <translation>Mangesium</translation>
     </message>
     <message>
         <source>Iron</source>
         <translation>Eisen</translation>
     </message>
     <message>
         <source>Cobalt</source>
         <translation>Kobalt</translation>
     </message>
     <message>
         <source>Nickel</source>
         <translation>Nickel</translation>
     </message>
     <message>
         <source>Copper</source>
         <translation>Kupfer</translation>
     </message>
     <message>
         <source>Zinc</source>
         <translation>Zink</translation>
     </message>
     <message>
         <source>Gallium</source>
         <translation>Gallium</translation>
     </message>
     <message>
         <source>Germanium</source>
         <translation>Germanium</translation>
     </message>
     <message>
         <source>Arsenic</source>
         <translation>Arsen</translation>
     </message>
     <message>
         <source>Selenium</source>
         <translation>Selen</translation>
     </message>
     <message>
         <source>Bromine</source>
         <translation>Brom</translation>
     </message>
     <message>
         <source>Krypton</source>
         <translation>Krypton</translation>
     </message>
     <message>
         <source>Rubidium</source>
         <translation>Rubidium</translation>
     </message>
     <message>
         <source>Strontium</source>
         <translation>Strontium</translation>
     </message>
     <message>
         <source>Yttrium</source>
         <translation>Yttrium</translation>
     </message>
     <message>
         <source>Zirconium</source>
         <translation>Zirconium</translation>
     </message>
     <message>
         <source>Niobium</source>
         <translation>Niob</translation>
     </message>
     <message>
         <source>Molybdenum</source>
         <translation>Molybden</translation>
     </message>
     <message>
         <source>Technetium</source>
         <translation>Technetium</translation>
     </message>
     <message>
         <source>Ruthenium</source>
         <translation>Ruthenium</translation>
     </message>
     <message>
         <source>Rhodium</source>
         <translation>Rhodium</translation>
     </message>
     <message>
         <source>Palladium</source>
         <translation>Palladium</translation>
     </message>
     <message>
         <source>Silver</source>
         <translation>Silber</translation>
     </message>
     <message>
         <source>Cadmium</source>
         <translation>Cadmium</translation>
     </message>
     <message>
         <source>Indium</source>
         <translation>Indium</translation>
     </message>
     <message>
         <source>Tin</source>
         <translation>Zinn</translation>
     </message>
     <message>
         <source>Antimony</source>
         <translation>Antimon</translation>
     </message>
     <message>
         <source>Tellurium</source>
         <translation>Tellur</translation>
     </message>
     <message>
         <source>Iodine</source>
         <translation>Iod</translation>
     </message>
     <message>
         <source>Xenon</source>
         <translation>Xenon</translation>
     </message>
     <message>
         <source>Cesium</source>
         <translation>Cäsium</translation>
     </message>
     <message>
         <source>Barium</source>
         <translation>Barium</translation>
     </message>
     <message>
         <source>Lanthanum</source>
         <translation>Lanthan</translation>
     </message>
     <message>
         <source>Cerium</source>
         <translation>Cer</translation>
     </message>
     <message>
         <source>Praseodymium</source>
         <translation>Praseodymium</translation>
     </message>
     <message>
         <source>Neodymium</source>
         <translation>Neodymium</translation>
     </message>
     <message>
         <source>Promethium</source>
         <translation>Promethium</translation>
     </message>
     <message>
         <source>Samarium</source>
         <translation>Samarium</translation>
     </message>
     <message>
         <source>Europium</source>
         <translation>Europium</translation>
     </message>
     <message>
         <source>Gadolinium</source>
         <translation>Gadolinium</translation>
     </message>
     <message>
         <source>Terbium</source>
         <translation>Terbium</translation>
     </message>
     <message>
         <source>Dysprosium</source>
         <translation>Dysprosium</translation>
     </message>
     <message>
         <source>Holmium</source>
         <translation>Holmium</translation>
     </message>
     <message>
         <source>Erbium</source>
         <translation>Erbium</translation>
     </message>
     <message>
         <source>Thulium</source>
         <translation>Thulium</translation>
     </message>
     <message>
         <source>Ytterbium</source>
         <translation>Ytterbium</translation>
     </message>
     <message>
         <source>Lutetium</source>
         <translation>Lutetium</translation>
     </message>
     <message>
         <source>Hafnium</source>
         <translation>Hafnium</translation>
     </message>
     <message>
         <source>Tantalum</source>
         <translation>Tantalum</translation>
     </message>
     <message>
         <source>Tungsten</source>
         <translation>Wolfram</translation>
     </message>
     <message>
         <source>Rhenium</source>
         <translation>Rhenium</translation>
     </message>
     <message>
         <source>Osmium</source>
         <translation>Osmium</translation>
     </message>
     <message>
         <source>Iridium</source>
         <translation>Iridium</translation>
     </message>
     <message>
         <source>Platinum</source>
         <translation>Platin</translation>
     </message>
     <message>
         <source>Gold</source>
         <translation>Gold</translation>
     </message>
     <message>
         <source>Mercury</source>
         <translation>Quecksilber</translation>
     </message>
     <message>
         <source>Thallium</source>
         <translation>Thallium</translation>
     </message>
     <message>
         <source>Lead</source>
         <translation>Blei</translation>
     </message>
     <message>
         <source>Bismuth</source>
         <translation>Bismut</translation>
     </message>
     <message>
         <source>Polonium</source>
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
@@ -1,97 +1,73 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CanvasCardWindow</name>
     <message>
         <source>Patience</source>
         <translation>Patience</translation>
     </message>
     <message>
         <source>Freecell</source>
         <translation>Freecell</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>
         <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>
         <source>Snap to position</source>
         <translation>Zu Position springen</translation>
     </message>
     <message>
         <source>Turn one card</source>
         <translation>Eine Karte drehen</translation>
     </message>
     <message>
         <source>Turn three cards</source>
         <translation>Drei Karten drehen</translation>
     </message>
 </context>
 </TS>
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
@@ -1,457 +1,422 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation>Sprache</translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation>Zeit und Datum</translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation>Persönliche Informationen</translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation>DocTab</translation>
     </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation>Anwendungsproblem</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation>&lt;p&gt;%1 antwortet nicht.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Möchten Sie die Anwendung abbrechen?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;p&gt;Schnellladen wurde für diese Anwendung ausgeschaltet. Tippen sie lange auf das Anwendungssymbol, um es wieder anzuschalten.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; wurde mit Signalcode %2 beendet&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation>Anwendung beendet</translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation>Anwendung nicht gefunden</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Konnte Anwendung &lt;b&gt;%1&lt;/b&gt; nicht finden&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Konnte die Anwendung %1 nicht finden&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
 </context>
 <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>
 <context>
     <name>FirstUse</name>
     <message>
         <source>&lt;&lt; Back</source>
         <translation>&lt;&lt; Zurück</translation>
     </message>
     <message>
         <source>Next &gt;&gt;</source>
         <translation>Weiter &gt;&gt;</translation>
     </message>
     <message>
         <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>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation>Starter</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation>- Starter</translation>
     </message>
     <message>
         <source>No application</source>
         <translation>Keine Anwendung</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation>&lt;p&gt;Es ist keine Anwendung für dieses Dokument des Typs %1 definiert&lt;/p&gt;.</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Dokumente</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>View as text</source>
         <translation>Als Text betrachten</translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation>&lt;b&gt;Finde Dokumente...&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation>Symbol-Ansicht</translation>
     </message>
     <message>
         <source>List View</source>
         <translation>Listenansicht</translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation>&lt;b&gt;Der Documentenreiter&lt;p&gt;wurde deaktiviert.&lt;p&gt;Verwenden Sie Einstellungen-&gt;Launcher-&gt;DocTab&lt;p&gt;zum reaktivieren.&lt;/b&gt;&lt;/center&gt;</translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>Document View</source>
         <translation>Dokumentenansicht</translation>
     </message>
     <message>
         <source>All types</source>
         <translation>Alle Typen</translation>
     </message>
 </context>
 <context>
     <name>Mediadlg</name>
     <message>
         <source>A new storage media detected:</source>
         <translation>Neues Speichermedium erkannt:</translation>
     </message>
     <message>
         <source>What should I do with it?</source>
         <translation>Was soll durchgeführt werden ?</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>Speichermedium konfigurieren. Die Änderungen werden erst nach Beeden dieser Anwendung und Auswerfen der Karte aktiv.</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation>Medientypen</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation></translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Bilder</translation>
     </message>
     <message>
         <source>Text</source>
         <translation></translation>
     </message>
     <message>
         <source>Video</source>
         <translation></translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation>Suche begrenzen auf:</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Hinzufügen</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Entfernen</translation>
     </message>
     <message>
         <source>Scan whole media</source>
         <translation>Ganzes Medium scannen</translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation>Dieses Medium immer überprüfen</translation>
     </message>
 </context>
 <context>
     <name>QueuedRequestRunner</name>
     <message>
         <source>Processing Queued Requests</source>
         <translation>Bearbeite die angesammelten Aufgaben</translation>
     </message>
 </context>
 <context>
     <name>SafeMode</name>
     <message>
         <source>Safe Mode</source>
         <translation>Sicherer Modus</translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation>Plugin Manager...</translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation>Qtopia neu starten</translation>
     </message>
     <message>
         <source>Help...</source>
         <translation>Hilfe...</translation>
     </message>
 </context>
 <context>
     <name>Server</name>
     <message>
         <source>USB Lock</source>
         <translation>USB Sperre</translation>
     </message>
 </context>
 <context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation>Information</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Das Systemdatum scheint nicht gültig zu sein.
 (%1)&lt;/p&gt;&lt;p&gt;Möchten Sie es anpassen?&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>Battery level is critical!
-Keep power off until power restored!</source>
-        <translation 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>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation>Plugin Manager...</translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation>Speicher Status</translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation>Knapper Speicher
 Bitte Daten sichern.</translation>
     </message>
     <message>
         <source>Critical Memory Shortage
 Please end this application
 immediately.</source>
         <translation>Kritische Speicherknappheit
 Bitte diese Anwendung 
 sofort beenden.</translation>
     </message>
     <message>
         <source>WARNING</source>
         <translation>Achtung</translation>
     </message>
     <message>
         <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
         <translation>Der Batteriestatus ist kritisch!
 Schließen Sie das Gerät schnellst 
 möglich an die Stromversorgung an</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>The battery is running very low. </source>
         <translation>Batterie nahezu erschöpft.</translation>
     </message>
     <message>
         <source>&lt;p&gt;The Back-up battery is very low&lt;p&gt;Please charge the back-up battery</source>
         <translation>Die Ersatzbatterie ist schwach.
 Bitte laden Sie sie auf</translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation>Herunterfahren</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation>Opie beenden </translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation>Neustart</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation>Opie neu starten</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation>Herunterfahren</translation>
     </message>
     <message>
-        <source>&lt;p&gt;
-These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
-        <translation 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>
         <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;Ein nicht authorisiertes System erwartet den Zugriff auf das Gerät.&lt;p&gt;Wenn Sie eine Version von QtopiaDesktop verwenden, die älter als 1.5.1 ist sollten Sie diese upgraden oder ändern sie die Sicherheitseinstellungen um IntelliSync zu verwenden.</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;Ein nicht authorisiertes System erwartet den Zugriff auf das Gerät.&lt;p&gt; Da Sie IntelliSync verwenden können sie die Verbindung erlauben oder ablehnen.&lt;/qt&gt;</translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Abort</source>
         <translation>Abbruch</translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation>Synchronisiere:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/security.ts b/i18n/de/security.ts
index d494b69..4bfc64a 100644
--- a/i18n/de/security.ts
+++ b/i18n/de/security.ts
@@ -1,441 +1,253 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>LoginBase</name>
     <message>
         <source>LoginBase</source>
         <translation></translation>
     </message>
     <message>
         <source>Login</source>
         <translation>Login</translation>
     </message>
     <message>
         <source>Login Automatically</source>
         <translation>Automatisch einloggen</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>Wenn diese Option gewählt ist, wird sich Opie-Login automatisch mit dem gewählten Benutzer einloggen.</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>Diese Auswahlliste erlaubt es den Benutzer für den automatischen
 Login einzustellen.</translation>
     </message>
 </context>
 <context>
     <name>MultiauthConfig</name>
     <message>
         <source>Security configuration</source>
         <translation>Sicherheits Einstellungen</translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>Verfügbare Plugins:</translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the order they will appear in</source>
         <translation>Mit den Checkboxen können Plugins aktiviert oder deaktiviert werden. Mit den Pfeil Buttons kann die Reihenfolge bestimmt werden</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>Hoch</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>Runter</translation>
     </message>
     <message>
         <source>plugins</source>
         <translation>Plugins</translation>
     </message>
     <message>
         <source>Authentication</source>
         <translation>Anmeldung</translation>
     </message>
     <message>
         <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>
         <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-securityplugin-*&lt;/em&gt; package! Once you have done that, you will be able to configure your PDA protection here.</source>
         <translation>Um Ihren PDA zu schützen müssen Sie ein &lt;em&gt;opie-securityplugin&lt;/em&gt; Paket installieren. Danach können sie den Schutz hier einstellen.</translation>
     </message>
 </context>
 <context>
     <name>MultiauthGeneralConfig</name>
     <message>
         <source>When to lock Opie</source>
         <translation>Opie sperren</translation>
     </message>
     <message>
         <source>on Opie start</source>
         <translation>Start von Opie</translation>
     </message>
     <message>
         <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>
         <source>Attention</source>
         <translation>Achtung</translation>
     </message>
     <message>
         <source>You must save your current settings before trying to authenticate. Press OK to accept and launch a simulated authentication process.</source>
         <translation>Die aktuellen Einstellungen müssen gespeichert werden vor dem Test.</translation>
     </message>
     <message>
         <source>If you don&apos;t like the result of this test, don&apos;t forget to change your settings before you exit the configuration application!</source>
         <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>
     </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>Wählen sie einen Netzbereich oder geben Sie einen neuen ein
 
 Die Auswahlliste bestimmt den Netzbereich für welchen der PDA Verbindungen akzeptiert.
 
 </translation>
     </message>
     <message>
         <source>Delete Entry</source>
         <translation>Eintrag löschen</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>Löschen des ausgewählten Netzbereiches
 
 Mit diesem Knopf wird der gerade ausgewählte Netzbereich gelöscht.</translation>
     </message>
     <message>
         <source>Restore Defaults</source>
         <translation>Vorgaben herstellen</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>Dieser Knopf stellt die Vorgabe-Netzliste wieder her, alle manuell
 geänderten Daten gehen dabei verloren!</translation>
     </message>
     <message>
         <source>Select your sync software</source>
         <translation>Sync. Software auswählen</translation>
     </message>
     <message>
         <source>Qtopia 1.7</source>
         <translation></translation>
     </message>
     <message>
         <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
@@ -1,209 +1,186 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>ControlsDialog</name>
     <message>
         <source>Brightness</source>
         <translation>Helligkeit</translation>
     </message>
 </context>
 <context>
     <name>ImageFileSelector</name>
     <message>
         <source>Title</source>
         <translation>Titel</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
 </context>
 <context>
     <name>ImageViewer</name>
     <message>
         <source>Image Viewer</source>
         <translation>Bildbetrachter</translation>
     </message>
     <message>
         <source>Horizontal flip</source>
         <translation>Horizontal drehen</translation>
     </message>
     <message>
         <source>Vertical flip</source>
         <translation>Vertical drehen</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Öffnen</translation>
     </message>
     <message>
         <source>Rotate 180</source>
         <translation>180° drehen</translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation>90° Drehen</translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation>Vollbild</translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation>- Bildbetrachter</translation>
     </message>
     <message>
         <source> True color</source>
         <translation>Echtfarben</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ansicht</translation>
     </message>
     <message>
         <source>Thumbnail View</source>
         <translation>Vorschau</translation>
     </message>
     <message>
         <source>Preferences..</source>
         <translation>Einstellungen..</translation>
     </message>
     <message>
         <source>Image Info ...</source>
         <translation>Bildinformationen...</translation>
     </message>
     <message>
         <source>Open ...</source>
         <translation>Öffnen...</translation>
     </message>
     <message>
         <source>Rotate 270</source>
         <translation>270° Drehen</translation>
     </message>
     <message>
         <source>Brightness ...</source>
         <translation>Helligkeit...</translation>
     </message>
     <message>
         <source>Black And White</source>
         <translation>Schwarzweiß</translation>
     </message>
     <message>
         <source>Scale to Screen</source>
         <translation>Auf Bildschirmgröße vergrößern</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Daten</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Optionen</translation>
     </message>
     <message>
         <source>%1 colors</source>
         <translation>%1 Farben</translation>
     </message>
     <message>
         <source>%1 alpha levels</source>
         <translation>%1 Alphakanäle</translation>
     </message>
     <message>
         <source>8-bit alpha channel</source>
         <translation>8-bit alpha Kanal</translation>
     </message>
     <message>
         <source>Slide show</source>
         <translation>Slideshow</translation>
     </message>
     <message>
         <source>Stop Slideshow</source>
         <translation>Slideshow anhalten</translation>
     </message>
 </context>
 <context>
     <name>InfoDialog</name>
     <message>
         <source>File Name</source>
         <translation>Dateiname</translation>
     </message>
     <message>
         <source>Format</source>
         <translation></translation>
     </message>
     <message>
         <source>File Size</source>
         <translation>Dateigröße</translation>
     </message>
     <message>
         <source>Size</source>
         <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>
     </message>
     <message>
         <source>s</source>
         <translation>s</translation>
     </message>
     <message>
         <source>Repeat slideshow</source>
         <translation>Slideshow wiederholen</translation>
     </message>
     <message>
         <source>Show pictures in reverse</source>
         <translation>Bilder rückwärts zeigen</translation>
     </message>
     <message>
         <source>Load pictures rotated 90 degrees</source>
         <translation>Bilder 90 Grad rotiert laden</translation>
     </message>
     <message>
         <source>Fast load pictures</source>
         <translation>Bilder voraus laden</translation>
     </message>
 </context>
 </TS>
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
@@ -1,53 +1,44 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>SnakeGame</name>
     <message>
         <source>Snake</source>
         <translation>Schlange</translation>
     </message>
     <message>
         <source>New Game</source>
         <translation>Neues Spiel</translation>
     </message>
     <message>
         <source>SNAKE!</source>
         <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
@@ -1,411 +1,366 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation>Dieser Bereich zeigt alle verfügbaren Tests, die Ergebnisse von durchgeführten Tests und Vergleichswerte für das eingestelle Gerät.
 Mit den Auswahlboxen kann man die gewünschten Tests einstellen.</translation>
     </message>
     <message>
         <source>Tests</source>
         <translation></translation>
     </message>
     <message>
         <source>Results</source>
         <translation>Ergebnisse</translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation>Vergleich</translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation>1. Integer Berechnungen</translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation>2. Fliesskomma Berechnungen</translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation>3. Text Rendern</translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation>4. Gfx Rendern</translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation></translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation></translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation></translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation>Test&amp;s starten!</translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation>Hier klicken um die ausgewählen Tests zu starten.</translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation>Wählen Sie ein Model um die Ergebnisse zu vergleichen.</translation>
     </message>
     <message>
         <source>error</source>
         <translation>Fehler</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>Dieser Graph zeigt an wieviel Speicher auf dieser CompactFlash-Karte verwendet wird.</translation>
     </message>
     <message>
         <source>Ha</source>
         <translation>Ha</translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation>Dieser Graph zeigt den auf dieser Festplatte verwendeten Speicher an.</translation>
     </message>
     <message>
         <source>SD</source>
         <translation>SD</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation>Dieser Graph zeigt den auf dieser Secure Digital Memory Card verwendeten Speicher an.</translation>
     </message>
     <message>
         <source>SC</source>
         <translation>SC</translation>
     </message>
     <message>
         <source>In</source>
         <translation>In</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation>Dieser Graph zeigt an, wie viel des eingebauten Speichers zur Zeit belegt wird.</translation>
     </message>
     <message>
         <source>RA</source>
         <translation>RA</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation>Dieser Graph zeigt den von der RAM Disk verwendeten Speicher an.</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>CPU-Auslastung für Anwendungen (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>Systemauslastung (%)</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Typ:</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Diese Seite zeigt die Auslastung des Prozessors.</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Genutzter Speicher (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Gepufferter Speicher (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Gecached (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Freier Speicher (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Gesamter Speicher: %1 kB</translation>
     </message>
     <message>
-        <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
-Memory is categorized as follows:
-
-1. Used - memory used to by Opie and any running applications.
-2. Buffers - temporary storage used to improve performance
-3. Cached - information that has recently been used, but has not been freed yet.
-4. Free - memory not currently used by Opie or any running applications.</source>
-        <translation 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.
 4. Frei - Speicher, der nicht durch Opie oder Anwendungen belegt wird. </translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation>Gesammter Swap: %1 kB</translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Modul</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Benutzung#</translation>
     </message>
     <message>
-        <source>Used By</source>
-        <translation type="obsolete">Benutzt von</translation>
-    </message>
-    <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>Dies ist ein eine Liste aller Kernelmodule, die zur Zeit in den Speicher geladen sind. Klicken Sie auf ei nModul und halten Sie den Stift dort, um erweiterte Informationen zu erhalten oder um das Modul zu entfernen.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Wählen Sie einen Befehl und klicken Sie auf &lt;b&gt;Senden&lt;/b&gt; um den Befehl auszuführen.
 &lt;b&gt;Warnung:&lt;/b&gt; Das Senden von Befehlen an Module ist gefährlich und sollte nur durchgeführt werden, wenn Sie wisse, was Sie tun.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Senden</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Klicken Sie hier, um den Befehl an das Module zu senden.
 &lt;b&gt;Warnung:&lt;/b&gt; Das Senden von Befehlen an Module ist gefährlich und sollte nur durchgeführt werden, wenn Sie wisse, was Sie tun.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Dieser Bereich zeigt detaillierte Informationen der Module.</translation>
     </message>
     <message>
-        <source>You really want to execute
-</source>
-        <translation type="obsolete">Möchten Sie den Befehl wirklich ausführen </translation>
-    </message>
-    <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>
     <message>
         <source>Available (%1 kB)</source>
         <translation>Verfügbar (%1 kB)</translation>
     </message>
     <message>
         <source> : %1 kB</source>
         <translation>: %1 kB</translation>
     </message>
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Befehl</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Zeit</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation>Dies ist eine Liste aller Prozesse dieses Gerätes.
 Klicken Sie und halten Sie den Stylus um weitere Prozessinformationen angezeigt zu bekommen oder um ein Signal dorthin zu senden.</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation>Wählen Sie ein Signal aus und drücken Sie rechts &lt;b&gt;Senden&lt;/b&gt; um das Signal an den Prozess zu senden.
 &lt;b&gt;Achtung:&lt;/b&gt;Das Senden von Signalen sollte nur dann durchgeführt werden, wenn Sie wissen was Sie tun.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Senden</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation>Klicken Sie hier, um das Signal an den Prozess zu senden.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>Dieser Bereich zeigt detaillierte Informationen über den gewählten Prozess an.</translation>
     </message>
     <message>
-        <source>You really want to send
-</source>
-        <translation type="obsolete">Wollen Sie das Signal wirklich senden </translation>
-    </message>
-    <message>
-        <source>You really want to send %1 to this process?</source>
-        <translation 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>
     <message>
         <source>Memory</source>
         <translation>Speicher</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Speichermedium</translation>
     </message>
     <message>
         <source>CPU</source>
         <translation>CPU</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Prozesse</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Version</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>Module</translation>
     </message>
     <message>
         <source>Benchmark</source>
         <translation></translation>
     </message>
     <message>
         <source>Syslog</source>
         <translation></translation>
     </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Kompiliert von:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Geschrieben am:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>&lt;p&gt;Version: </translation>
     </message>
     <message>
-        <source>&lt;p&gt;Model: </source>
-        <translation 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>
         <source>Built against Qt/E </source>
         <translation>Qt/E Version</translation>
     </message>
 </context>
 </TS>
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,70 +1,59 @@
 <!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>
     <message>
         <source>TableViewer - Edit Keys</source>
         <translation>TableViewer - Schlüssel bearbeiten</translation>
     </message>
     <message>
         <source>Key Name</source>
         <translation>Schlüssel Name</translation>
     </message>
     <message>
         <source>Key Type</source>
         <translation>Schlüssel Typ</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Clear All</source>
         <translation>Alles leeren</translation>
     </message>
 </context>
 <context>
     <name>TVListView</name>
     <message>
         <source>List View</source>
         <translation>Listen Ansicht</translation>
     </message>
 </context>
 <context>
     <name>TableViewerWindow</name>
     <message>
         <source>Table Viewer</source>
         <translation>Tabellen Betrachter</translation>
     </message>
     <message>
         <source>could not load Document</source>
         <translation>konnte Dokument nicht laden</translation>
     </message>
 </context>
 </TS>
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
@@ -1,284 +1,278 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>TextEdit</name>
     <message>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Öffnen</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Speichern</translation>
     </message>
     <message>
         <source>Save As</source>
         <translation>Speichern unter</translation>
     </message>
     <message>
         <source>Cut</source>
         <translation>Ausschneiden</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Kopieren</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Einfügen</translation>
     </message>
     <message>
         <source>Find...</source>
         <translation>Suchen...</translation>
     </message>
     <message>
         <source>Zoom in</source>
         <translation>Zoom in</translation>
     </message>
     <message>
         <source>Zoom out</source>
         <translation>Zoom aus</translation>
     </message>
     <message>
         <source>Wrap lines</source>
         <translation>Zeilenumbruch</translation>
     </message>
     <message>
         <source>Start with new file</source>
         <translation>Mit neuer Datei beginnen</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editieren</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ansicht</translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation>Nächsten suchen</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>&quot;Suchen&quot; schließen</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation>Texteditor</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Schrift</translation>
     </message>
     <message>
         <source>.desktop File</source>
         <translation>.desktop-Datei</translation>
     </message>
     <message>
         <source>Linked Document</source>
         <translation>Verknüpfung</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Text</translation>
     </message>
     <message>
         <source>Insert Time and Date</source>
         <translation>Zeit und Datum einfügen</translation>
     </message>
     <message>
         <source>Advanced Features</source>
         <translation>Erweiterte Einstellungen</translation>
     </message>
     <message>
         <source>Prompt on Exit</source>
         <translation>Nachfragen beim Verlassen</translation>
     </message>
     <message>
         <source>Always open linked file</source>
         <translation>Immer die verknüpfte Datei öffnen</translation>
     </message>
     <message>
         <source>File Permissions</source>
         <translation>Dateirechte</translation>
     </message>
     <message>
         <source>Search Bar Open</source>
         <translation>Suchleiste öffnen</translation>
     </message>
     <message>
         <source>Goto Line...</source>
         <translation>Gehe zu Linie...</translation>
     </message>
     <message>
         <source>Auto Save 5 min.</source>
         <translation>Autospeichern 5 min.</translation>
     </message>
     <message>
         <source>Text Editor has detected&lt;BR&gt;you selected a &lt;B&gt;.desktop&lt;/B&gt;file.&lt;BR&gt;Open&lt;B&gt;.desktop&lt;/B&gt; file or &lt;B&gt;linked&lt;/B&gt; file?</source>
         <translation>Texteditor hat ein &lt;BR&gt;&lt;B&gt;Desktopfile&lt;/B&gt;&lt;BR&gt;erkannt.
 &lt;B&gt;.desktop-Datei&lt;/B&gt; oder &lt;B&gt;verlinkte&lt;/B&gt; Datei öffnen ?</translation>
     </message>
     <message>
         <source>Text Edit</source>
         <translation>Texteditor</translation>
     </message>
     <message>
         <source>Write Failed</source>
         <translation>Speichern fehlgeschlagen</translation>
     </message>
     <message>
         <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>
         <source>Textedit</source>
         <translation>Texteditor</translation>
     </message>
     <message>
         <source>Textedit detected
 you have unsaved changes
 Go ahead and save?
 </source>
         <translation>Texteditor hat ungespeicherte
 Änderungen festgestellt.
 Speichern und weitermachen ?</translation>
     </message>
     <message>
         <source>Don&apos;t Save</source>
         <translation>Nicht speichern</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Abbrechen</translation>
     </message>
     <message>
         <source>Not enough lines</source>
         <translation>Nciht genug Zeilen</translation>
     </message>
     <message>
         <source>%1 - Text Editor</source>
         <translation>%1 - Texteditor</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>Wirklich aktuelle Datei von&lt;BR&gt;
 Platte &lt;B&gt;löschen&lt;/B&gt;?&lt;BR&gt;
 Das ist &lt;B&gt;irreversibel!&lt;/B&gt;</translation>
     </message>
     <message>
         <source>Save Failed</source>
         <translation>Speichern fehlgeschlagen</translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Dateirechte setzen</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Setze Dateirechte für:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>Besitzer</translation>
     </message>
     <message>
         <source>group</source>
         <translation>Gruppe</translation>
     </message>
     <message>
         <source>others</source>
         <translation>andere</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Besitzer</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Gruppe</translation>
     </message>
     <message>
         <source>read</source>
         <translation>lesen</translation>
     </message>
     <message>
         <source>write</source>
         <translation>schreiben</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>ausführen</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation>Fehler- kein Nutzer</translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation>Fehler- keine Gruppe</translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation>Fehler beim Setzen des Benutzers oder der Gruppe</translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation>Fehler beim Setzen des Modus</translation>
     </message>
     <message>
         <source>File Permissions</source>
         <translation>Dateirechte</translation>
     </message>
 </context>
 </TS>
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,48 +1,41 @@
 <!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>
     </message>
     <message>
         <source>Quit</source>
         <translation>Beenden</translation>
     </message>
     <message>
         <source>Click Play to start</source>
         <translation>Auf &apos;Los!&apos; klicken, um zu starten</translation>
     </message>
     <message>
         <source>Make your move</source>
         <translation>Ziehen Sie</translation>
     </message>
     <message>
         <source>You won!</source>
         <translation>Sie haben gewonnen!</translation>
     </message>
     <message>
         <source>Computer won!</source>
         <translation>Der Computer hat gewonnen!</translation>
     </message>
     <message>
         <source>It&apos;s a draw</source>
         <translation>Unentschieden</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/today.ts b/i18n/de/today.ts
index 4da365e..72691ff 100644
--- a/i18n/de/today.ts
+++ b/i18n/de/today.ts
@@ -1,201 +1,145 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Today</name>
     <message>
         <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>
         <translation>Heute</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
         <translation>Heute von Maximilian Reiß</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>Klicken Sie hier, um den Konfigurations-
 dialog zu starten</translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>Reihenfolge des Plugin-Ladens:</translation>
     </message>
     <message>
         <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>
         <source>autostart on resume?</source>
         <translation>autostart bei resume?</translation>
     </message>
     <message>
         <source>tiny banner</source>
         <translation>Kleiner Banner</translation>
     </message>
     <message>
         <source>Have small banner </source>
         <translation>Soll der Banner kleiner angezeigt werden</translation>
     </message>
     <message>
         <source> min</source>
         <translation>min</translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
         <translation>Der Autostart wird erst aktiv, wenn das Gerät über den eingestellten Zeitraum hinaus ausgeschaltet war</translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation>Minuten inaktiv</translation>
     </message>
     <message>
         <source> pixel</source>
         <translation>pixel</translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
         <translation>Symbolgröße in Pixeln einstellen</translation>
     </message>
     <message>
         <source>icon size</source>
         <translation></translation>
     </message>
     <message>
         <source> sec</source>
         <translation>Sekunden</translation>
     </message>
     <message>
         <source>never</source>
         <translation>niemals</translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
         <translation>Wie häufig soll &quot;Heute&quot; sich aktualisieren</translation>
     </message>
     <message>
         <source>refresh</source>
         <translation></translation>
     </message>
 </context>
 </TS>
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,658 +1,561 @@
 <!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>
 <context>
     <name>NewTaskDlg</name>
     <message>
         <source>New Task</source>
         <translation>Neue Aufgabe</translation>
     </message>
     <message>
         <source>Blank task</source>
         <translation>Leere Aufgabe</translation>
     </message>
     <message>
         <source>Using template:</source>
         <translation>Vorlage:</translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Alarms</source>
         <translation>Alarme</translation>
     </message>
     <message>
         <source>Information</source>
         <translation>Information</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
         <source>Recurrence</source>
         <translation>Wiederholung</translation>
     </message>
     <message>
         <source>Task Editor</source>
         <translation>Aufgaben Editor</translation>
     </message>
 </context>
 <context>
     <name>Opie</name>
     <message>
         <source>Todo List</source>
         <translation>Aufgabenliste</translation>
     </message>
     <message>
         <source>Task</source>
         <translation>Aufgabe</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
         <translation>Aufgabe erstellen</translation>
     </message>
     <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.
 
 Er ermöglicht die schnelle Erfassung einer neuen Aufgabe. Dieser Bereich kann ein- und ausgeschaltet werden durch Verwenden des Menüpunkts &lt;b&gt;Optionen-&gt;Schnelleingabe&lt;/b&gt;.</translation>
     </message>
     <message>
         <source>Enter description of new task here.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Geben Sie hier die Beschreibung der neuen Aufgabe an.
 Dieser Bereich wird &lt;i&gt;Schnelleingabe&lt;/i&gt; genannt.
 
 Er ermöglicht die schnelle Erfassung einer neuen Aufgabe. Dieser Bereich kann ein- und ausgeschaltet werden durch Verwenden des Menüpunkts &lt;b&gt;Optionen-&gt;Schnelleingabe&lt;/b&gt;.</translation>
     </message>
     <message>
         <source>More</source>
         <translation>Weiteres</translation>
     </message>
     <message>
         <source>Click here to enter additional information for new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Geben Sie hier zusätzliche Informationen für Ihre Aufgabe an.
 Dieser Bereich wird &lt;i&gt;Schnelleingabe&lt;/i&gt; genannt.
 
 Er ermöglicht die schnelle Erfassung einer neuen Aufgabe. Dieser Bereich kann ein- und ausgeschaltet werden durch Verwenden des Menüpunkts &lt;b&gt;Optionen-&gt;Schnelleingabe&lt;/b&gt;.</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Eingabe</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>Klicken Sie hier, um eine neue Aufgabe hinzuzufügen.
 Dieser Bereich wird &lt;i&gt;Schnelleingabe&lt;/i&gt; genannt.
 
 Er ermöglicht die schnelle Erfassung einer neuen Aufgabe. Dieser Bereich kann ein- und ausgeschaltet werden durch Verwenden des Menüpunkts &lt;b&gt;Optionen-&gt;Schnelleingabe&lt;/b&gt;.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
         <source>Click here to reset new task information.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Klicken Sie hier, um die Aufgabeninformationen zurück zu setzen.
 Dieser Bereich wird &lt;i&gt;Schnelleingabe&lt;/i&gt; genannt.
 
 Er ermöglicht die schnelle Erfassung einer neuen Aufgabe. Dieser Bereich kann ein- und ausgeschaltet werden durch Verwenden des Menüpunkts &lt;b&gt;Optionen-&gt;Schnelleingabe&lt;/b&gt;.</translation>
     </message>
     <message>
         <source>Template Editor</source>
         <translation>Vorlageneditor</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Hinzufügen</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Bearbeiten</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Entfernen</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation>Neu von Vorlage</translation>
     </message>
     <message>
         <source>Data can not be edited, currently syncing</source>
         <translation>Daten können nicht bearbeitet werden, es wird synchronisiert</translation>
     </message>
     <message>
         <source>Data can&apos;t be edited, currently syncing</source>
         <translation>Daten können nicht bearbeitet werden, es wird synchronisiert</translation>
     </message>
     <message>
         <source>Summary</source>
         <translation>Beschreibung</translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>Table View</source>
         <translation>Tabellenansicht</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Keine</translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation>%1 Tag(e)</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Bearbeiten</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Zeit</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Art</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Description:</source>
         <translation>Beschreibung:</translation>
     </message>
     <message>
         <source>Enter brief description of the task here.</source>
         <translation>Geben Sie hier eine detaillierte Beschreibung der Aufgabe ein.</translation>
     </message>
     <message>
         <source>Complete </source>
         <translation>Erledige</translation>
     </message>
     <message>
         <source>Work on </source>
         <translation>Arbeite an </translation>
     </message>
     <message>
         <source>Buy </source>
         <translation>Kaufe</translation>
     </message>
     <message>
         <source>Organize </source>
         <translation>Organiziere</translation>
     </message>
     <message>
         <source>Get </source>
         <translation>Hole</translation>
     </message>
     <message>
         <source>Update </source>
         <translation>Aktualisiere</translation>
     </message>
     <message>
         <source>Create </source>
         <translation>Erstelle</translation>
     </message>
     <message>
         <source>Plan </source>
         <translation>Plane</translation>
     </message>
     <message>
         <source>Call </source>
         <translation>Anruf</translation>
     </message>
     <message>
         <source>Mail </source>
         <translation>Maile</translation>
     </message>
     <message>
         <source>Select priority of task here.</source>
         <translation>Wählen Sie hier die Priorität der Aufgabe.</translation>
     </message>
     <message>
         <source>Very High</source>
         <translation>Sehr hoch</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Hoch</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Niedrig</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>Sehr niedrig</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Select category to organize this task with.</source>
         <translation>Wählen Sie die Kategorie der Aufgabe</translation>
     </message>
     <message>
         <source>Recurring task</source>
         <translation>Wiederkehrende Aufgabe</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>Klicken Sie hier, wenn die Aufgaben auf einer wiederkehrenden Basis anstehen. Bei Auswahl kann die Häufigkeit des Wiederkehrens über den &lt;b&gt;Wiederholung&lt;/b&gt;-Reiter gesetzt werden.</translation>
     </message>
     <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>
         <source>Started</source>
         <translation>Begonnen</translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation>Verschoben</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>Beendet</translation>
     </message>
     <message>
         <source>Not started</source>
         <translation>Nicht begonnen</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Fortschritt</translation>
     </message>
     <message>
         <source>Select progress made on this task here.</source>
         <translation>Wählen Sie hier den aktuellen Fortschritt der Aufgabe aus.</translation>
     </message>
     <message>
         <source>0 %</source>
         <translation>0 %</translation>
     </message>
     <message>
         <source>20 %</source>
         <translation>20 %</translation>
     </message>
     <message>
         <source>40 %</source>
         <translation>40 %</translation>
     </message>
     <message>
         <source>60 %</source>
         <translation>60 %</translation>
     </message>
     <message>
         <source>80 %</source>
         <translation>80 %</translation>
     </message>
     <message>
         <source>100 %</source>
         <translation>100 %</translation>
     </message>
     <message>
         <source>Start Date:</source>
         <translation>Startdatum</translation>
     </message>
     <message>
         <source>Click here to set the date this task was started.</source>
         <translation>Klicken Sie hier, um das Startdatum der aktuellen Aufgabe zu setzen.</translation>
     </message>
     <message>
         <source>Due Date:</source>
         <translation>Fälligkeitsdatum:</translation>
     </message>
     <message>
         <source>Click here to set the date this task needs to be completed by.</source>
         <translation>Klicken Sie hier, um das aktuelle Fälligkeitsdatum der Aufgabe zu setzen.</translation>
     </message>
     <message>
         <source>Completed:</source>
         <translation>Erledigt:</translation>
     </message>
     <message>
         <source>Click here to mark this task as completed.</source>
         <translation>Klicken Sie hier, um diese Aufgabe als erledigt zu markieren</translation>
     </message>
     <message>
         <source>Click here to set the date this task was completed.</source>
         <translation>Klicken Sie hier. um das Datum der Erledigung zu setzen.</translation>
     </message>
     <message>
         <source>Maintainer Mode:</source>
         <translation>Ausführungsmodus</translation>
     </message>
     <message>
         <source>Click here to set the maintainer&apos;s role.</source>
         <translation>Klicken Sie hier, um die Rolle des Ausführenden zu definieren.</translation>
     </message>
     <message>
         <source>Nothing</source>
         <translation>Nichts</translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation>Verantwortlich</translation>
     </message>
     <message>
         <source>Done By</source>
         <translation>Erledigt von</translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation>Koordiniert durch</translation>
     </message>
     <message>
         <source>Maintainer:</source>
         <translation>Ausführender:</translation>
     </message>
     <message>
         <source>This is the name of the current task maintainer.</source>
         <translation>Dies ist der Name des Ausführenden</translation>
     </message>
     <message>
         <source>test</source>
         <translation>test</translation>
     </message>
     <message>
         <source>Click here to select the task maintainer.</source>
         <translation>Klicken Sie  hier, um den Ausführenden der Aufgabe festzulegen.</translation>
     </message>
 </context>
 </TS>
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
@@ -1,35 +1,31 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GroupDialog</name>
     <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>
         <translation>Benutzer editieren</translation>
     </message>
 </context>
 </TS>
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,873 +1,573 @@
 <!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>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation>ComboBox DateitypFilter
 Bearbeiten oder auswählen des Filters</translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation>bestätigt die Auswahl und schließt den Dialog</translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation>OKKnopf</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation>verwirft die Auswahl und schließt den Dialog</translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation>AbbruchKnopf</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation>zeigt den ausgewählten Dateinamen</translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation>Dateinamen Zeileneditor
 
 Zeigt die ausgewählte Zeile
 und erlaubt die direkte
 Dateinamen Eingabe</translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation>ComboBox Verzeichnis
 Bearbeiten oder auswählen des Verzeichnisnamens</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation>Verzeichnis Listenansicht
 
 Zeigt die Liste der Verzeichnisse und Dateien</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation>Verz</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <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>
         <source>&amp;Import text file</source>
         <translation>Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
         <translation>Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
         <translation>&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Ändern</translation>
     </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>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation>Wollen Sie wirklich löschen?</translation>
     </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>
         <translation>Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
         <translation>Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
         <translation>Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
         <translation>Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
         <translation>Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
         <translation>Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
         <translation>Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
         <translation>&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
         <translation>Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
         <translation>&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
         <translation>Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
         <translation>Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
         <translation>Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
         <translation>Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
         <translation>Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation>&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
         <translation>Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
         <translation>&amp;Nicht sichern</translation>
     </message>
     <message>
         <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>
         <source>Find entry</source>
         <translation>Eintrag finden</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Text</translation>
     </message>
     <message>
         <source>Remove text file</source>
         <translation>Textdatei entfernen</translation>
     </message>
     <message>
         <source>No document defined.
 You have to create a new document</source>
         <translation>Kein Dokument angegeben.
 Sie müssen erst ein neues
 Dokument erstellen</translation>
     </message>
     <message>
         <source>Export text file</source>
         <translation>Textdatei exportiren</translation>
     </message>
     <message>
         <source>Import text file</source>
         <translation>Textdatei importieren</translation>
     </message>
     <message>
         <source>Do you want to save </source>
         <translation>Möchten Sie speichern</translation>
     </message>
     <message>
         <source>
 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>
     <message>
         <source>&lt;P&gt;You must create a new document first. Ok to create?&lt;/P&gt;</source>
         <translation>&lt;P&gt;Sie müssen erst ein neues Dokument erstellen. Dokument anlegen?&lt;/P&gt;
 </translation>
     </message>
     <message>
         <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Password Manager&lt;br&gt;ZSafe version 2.1.2&lt;br&gt;&lt;/b&gt;by Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Translations by Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Password Manager&lt;br&gt;ZSafe version 2.1.2&lt;br&gt;&lt;/b&gt;von Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Übersetzung von Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <source>Copy to Clipboard</source>
         <translation>In die Zwischenablage kopieren</translation>
     </message>
     <message>
         <source>Show Info</source>
         <translation>Info anzeigen</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
 </context>
 </TS>
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
@@ -1,723 +1,731 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Continue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error!</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>This is an all day event.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this occurence</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00 PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Views</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
+    <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>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstEvent</name>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Start Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Silent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>nd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>rd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>th</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</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,71 +1,68 @@
 <!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>
     </message>
     <message>
         <source>Stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
         <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>
     </message>
 </context>
 </TS>
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
@@ -1,300 +1,328 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BaseSetup</name>
     <message>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slideshow timeout:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Toggle autoscale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to next image</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Delete Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Image Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></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>Browser Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Keyboard Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie Eye - Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Imageinfo Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Imageview Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Go dir up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start slideshow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and Imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show images fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto rotate images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show images unscaled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show zoomer window when unscaled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
     <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>
         <source>&lt;center&gt;&lt;b&gt;Be carefull with the following options!&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show files recursive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recursion depth:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Digital Camera View</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Name Only</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>imageinfo</name>
     <message>
         <source>View Full Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays an thumbnail of the image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays info of selected image</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,817 +1,878 @@
 <!DOCTYPE TS><TS>
 <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>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerUI</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposeMail</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please create an SMTP account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a File.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Store message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Store message into drafts?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Attachments will not be stored in &quot;Draft&quot; folder&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Receiver specified</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposeMailUI</name>
     <message>
         <source>Compose Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>send later</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>use:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BCC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <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>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>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete the selected Account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select an account.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccountsUI</name>
     <message>
         <source>Configure Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>News</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IMAPconfigUI</name>
     <message>
         <source>Configure IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefix</source>
         <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>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>
     </message>
     <message>
         <source>Send queued mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show/Hide folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Newsgroups</source>
         <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>
     </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>
 <context>
     <name>NNTPconfigUI</name>
     <message>
         <source>Configure NNTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Newsgroup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get newsgroup list from server</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Newmdirdlgui</name>
     <message>
         <source>Enter directory name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directory name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directory contains other subdirs</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <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>
     </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>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></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>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec imapd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>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>
     </message>
     <message>
         <source>Use Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the SMTP Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port of the SMTP Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SelectMailTypeUI</name>
     <message>
         <source>Select Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Account Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>POP3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SMTP</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SettingsDialogUI</name>
     <message>
         <source>Settings Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View mail as Html</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compose Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mails later ( enqueue in outbox )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></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>
     </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>
     </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>
     </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>
     </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>
     </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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Store mail(s) to&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Folder:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create new folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefix will prepend, no need to enter it!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move mail(s)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,832 +1,566 @@
 <!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>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <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>
         <source>&amp;Import text file</source>
         <translation>Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
         <translation>Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
         <translation>&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation 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>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation 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>
         <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
         <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
         <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
         <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
         <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
         <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
         <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
         <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
         <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
         <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
         <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
         <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
         <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
         <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
         <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
         <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
-        <source>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>
         <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No document defined.
 You have to create a new document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to save </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 before continuing?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Now you have to enter
 a password twice for your
 newly created document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&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>
         <source>&lt;P&gt;You must create a new document first. Ok to create?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Password Manager&lt;br&gt;ZSafe version 2.1.2&lt;br&gt;&lt;/b&gt;by Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Translations by Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,723 +1,731 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Continue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error box</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is an all day event.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this occurence</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Views</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
+    <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>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstEvent</name>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End Time</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Silent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start time</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>nd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>rd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>th</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</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,71 +1,68 @@
 <!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>
     </message>
     <message>
         <source>Stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
         <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>
     </message>
 </context>
 </TS>
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
@@ -1,300 +1,328 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BaseSetup</name>
     <message>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slideshow timeout:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Toggle autoscale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to next image</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Delete Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Image Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></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>Browser Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Keyboard Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie Eye - Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Imageinfo Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Imageview Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Go dir up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start slideshow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and Imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show images fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto rotate images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show images unscaled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show zoomer window when unscaled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
     <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>
         <source>&lt;center&gt;&lt;b&gt;Be carefull with the following options!&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show files recursive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recursion depth:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Digital Camera View</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Name Only</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>imageinfo</name>
     <message>
         <source>View Full Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays an thumbnail of the image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays info of selected image</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,817 +1,878 @@
 <!DOCTYPE TS><TS>
 <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>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerUI</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposeMail</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please create an SMTP account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a File.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Store message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Store message into drafts?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Attachments will not be stored in &quot;Draft&quot; folder&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Receiver specified</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposeMailUI</name>
     <message>
         <source>Compose Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>send later</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>use:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BCC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <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>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>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete the selected Account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select an account.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccountsUI</name>
     <message>
         <source>Configure Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>News</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IMAPconfigUI</name>
     <message>
         <source>Configure IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefix</source>
         <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>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>
     </message>
     <message>
         <source>Send queued mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show/Hide folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Newsgroups</source>
         <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>
     </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>
 <context>
     <name>NNTPconfigUI</name>
     <message>
         <source>Configure NNTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Newsgroup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get newsgroup list from server</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Newmdirdlgui</name>
     <message>
         <source>Enter directory name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directory name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directory contains other subdirs</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <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>
     </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>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></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>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec imapd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>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>
     </message>
     <message>
         <source>Use Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the SMTP Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port of the SMTP Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SelectMailTypeUI</name>
     <message>
         <source>Select Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Account Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>POP3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SMTP</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SettingsDialogUI</name>
     <message>
         <source>Settings Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View mail as Html</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compose Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mails later ( enqueue in outbox )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></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>
     </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>
     </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>
     </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>
     </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>
     </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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Store mail(s) to&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Folder:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create new folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefix will prepend, no need to enter it!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move mail(s)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,832 +1,566 @@
 <!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>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <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>
         <source>&amp;Import text file</source>
         <translation>Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
         <translation>Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
         <translation>&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation 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>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation 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>
         <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
         <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
         <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
         <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
         <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
         <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
         <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
         <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
         <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
         <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
         <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
         <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
         <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
         <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
         <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
         <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
-        <source>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>
         <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No document defined.
 You have to create a new document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to save </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 before continuing?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Now you have to enter
 a password twice for your
 newly created document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&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>
         <source>&lt;P&gt;You must create a new document first. Ok to create?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Password Manager&lt;br&gt;ZSafe version 2.1.2&lt;br&gt;&lt;/b&gt;by Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Translations by Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,569 +1,489 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation>Nombre Completo</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Contacto</translation>
     </message>
     <message>
         <source>Pick</source>
         <translation>Elige</translation>
     </message>
 </context>
 <context>
     <name>AbView</name>
     <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>
         <source>Unable to find a contact for this search pattern!</source>
         <translation>¡Incapaz de encontrar un contacto
 con ese patrón de búsqueda!</translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation>El fichero seleccionado
 no termina en &quot;.vcf&quot;.
 ¿Seguro que quiere abrirlo?</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>¿Añadir contacto?</translation>
     </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>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation>Estilo consulta</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>Usar expresiones regulares</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>Usar comodines (*,?)</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Distinguir may/min</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Correo</translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation>Prefiere QT-Mail </translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation>Prefiere Opie-Mail</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Misc</translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation>Configuración de Búsqueda</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Letra</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Pequeña</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Grande</translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation>Aviso: QT-Mail sólo se
 suministra en la Rom de
 SHARP. ¡Opie-Mail se
 suministra gratis!</translation>
     </message>
     <message>
         <source>Order</source>
         <translation>Orden</translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation>Seleccionar orden de contactos:</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Subir</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Bajar</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Añadir</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation>Configuración</translation>
     </message>
     <message>
         <source>Click on tab to select one</source>
         <translation>Pulse tab para seleccionar uno</translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation>Configuración del estilo de búsqueda</translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation>El botón de búsqueda espera una expresión regular al selecionarse</translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
         <translation>El botón de búsqueda espera sólo comodines simples</translation>
     </message>
     <message>
         <source>If selected, search differs between upper and lower chars</source>
         <translation>Si lo selecciona, la búsqueda diferencia entre mayúsculas y minúsculas</translation>
     </message>
     <message>
         <source>Font size for list- and card view</source>
         <translation>Tamaño de letra para la vista en lista y tarjetas</translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
         <translation>Configuración de letras para la vista en lista y tarjetas</translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation>Use la aplicación de correo de Sharp si está disponible</translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</source>
         <translation>Use el correo de OPIE si está instalado</translation>
     </message>
     <message>
         <source>Move selected attribute one line up</source>
         <translation>Sube los atributos seleccionados una línea</translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation>Baja los atributos seleccionados una línea</translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation>Lista de todos los atributos disponibles</translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation>Añade el atributo seleccionado de la lista inferior a la lista superior</translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation>Borra el atributo seleccionado de la lista superior</translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation>Orden (arriba-&gt;abajo) que define el contacto principal que se muestra el la segunda columna en la vista en lista</translation>
     </message>
     <message>
         <source>Tool-/Menubar</source>
         <translation>Herramienta-/Barra de menú</translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation>Arreglado</translation>
     </message>
     <message>
         <source>Switch to fixed menu-/toolbars after restarting application !</source>
         <translation>¡Cambie entre menu fijo-/barra de herramientas después de reiniciar la aplicación!</translation>
     </message>
     <message>
         <source>Moveable</source>
         <translation>Movible</translation>
     </message>
     <message>
         <source>Switch to moveable menu-/toolbars after restarting application !</source>
         <translation>¡Cambie a menú-/barra de herramientas después de reiniciar la aplicación!</translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>First Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Segundo</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Apellidos</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Sufijo</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Archivar como</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Género</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Cargo</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Ciudad</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Provincia</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>País</translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation>Nombre...</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Organización</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Categoría</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Notas...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>General</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Oficina</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Casa</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Dirección</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>Código postal</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>Estados Unidos</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Gran Bretaña</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>Japón</translation>
     </message>
     <message>
         <source>France</source>
         <translation>Francia</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>Alemania</translation>
     </message>
     <message>
         <source>Norway</source>
         <translation>Noruega</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>Canadá</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Hombre</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Mujer</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Detalles</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>Introducir Nota</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>Editar Nombre</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Contactos</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation>Albania</translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation>Argelia</translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation>Samoa</translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation>Andorra</translation>
     </message>
     <message>
         <source>Angola</source>
         <translation>Angola</translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation>Antillas</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>Argentina</translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation>Aruba</translation>
     </message>
     <message>
         <source>Australia</source>
         <translation>Australia</translation>
     </message>
     <message>
         <source>Austria</source>
         <translation>Austria</translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation>Acerballán</translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation>Bahamas</translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation>Bahrain</translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation>Bangladesh</translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation>Barbados</translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation>Belarus</translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation>Bélgica</translation>
     </message>
     <message>
@@ -1013,552 +933,385 @@ suministra gratis!</translation>
     <message>
         <source>Oman</source>
         <translation>Omán</translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation>Pakistán</translation>
     </message>
     <message>
         <source>Palau</source>
         <translation>Palau</translation>
     </message>
     <message>
         <source>Panama</source>
         <translation>Panamá</translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation>Papúa Nueva Guinea</translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation>Paraguay</translation>
     </message>
     <message>
         <source>Peru</source>
         <translation>Perú</translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation>Filipinas</translation>
     </message>
     <message>
         <source>Poland</source>
         <translation>Polonia</translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation>Portugal</translation>
     </message>
     <message>
         <source>Puerto Rico</source>
         <translation>Puerto Rico</translation>
     </message>
     <message>
         <source>Qatar</source>
         <translation>Qatar</translation>
     </message>
     <message>
         <source>Reunion</source>
         <translation>Reunion</translation>
     </message>
     <message>
         <source>Romania</source>
         <translation>Rumanía</translation>
     </message>
     <message>
         <source>Russia</source>
         <translation>Rusia</translation>
     </message>
     <message>
         <source>Rwanda</source>
         <translation>Ruanda</translation>
     </message>
     <message>
         <source>Saint Lucia</source>
         <translation>Santa Lucía</translation>
     </message>
     <message>
         <source>Samoa</source>
         <translation>Samoa</translation>
     </message>
     <message>
         <source>San Marino</source>
         <translation>San Marino</translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
         <translation>Arabia Saudí</translation>
     </message>
     <message>
         <source>Senegal</source>
         <translation>Senegal</translation>
     </message>
     <message>
         <source>Seychelles</source>
         <translation>Seychelles</translation>
     </message>
     <message>
         <source>Sierra Leone</source>
         <translation>Sierra Leona</translation>
     </message>
     <message>
         <source>Singapore</source>
         <translation>Singapur</translation>
     </message>
     <message>
         <source>Slovakia</source>
         <translation>Eslovaquia</translation>
     </message>
     <message>
         <source>Slovenia</source>
         <translation>Eslovenia</translation>
     </message>
     <message>
         <source>Solomon Islands</source>
         <translation>Islas Solomon</translation>
     </message>
     <message>
         <source>Somalia</source>
         <translation>Somalia</translation>
     </message>
     <message>
         <source>South Africa</source>
         <translation>Sudáfrica</translation>
     </message>
     <message>
         <source>Spain</source>
         <translation>España</translation>
     </message>
     <message>
         <source>Sri Lanka</source>
         <translation>Sri Lanka</translation>
     </message>
     <message>
         <source>St. Helena</source>
         <translation>Santa Helena</translation>
     </message>
     <message>
         <source>Sudan</source>
         <translation>Sudán</translation>
     </message>
     <message>
         <source>Suriname</source>
         <translation>Suriname</translation>
     </message>
     <message>
         <source>Swaziland</source>
         <translation>Swazilandia</translation>
     </message>
     <message>
         <source>Sweden</source>
         <translation>Suecia</translation>
     </message>
     <message>
         <source>Switzerland</source>
         <translation>Suiza</translation>
     </message>
     <message>
         <source>Taiwan</source>
         <translation>Taiwan</translation>
     </message>
     <message>
         <source>Tajikistan</source>
         <translation>Tajikistan</translation>
     </message>
     <message>
         <source>Tanzania</source>
         <translation>Tanzania</translation>
     </message>
     <message>
         <source>Thailand</source>
         <translation>Tailandia</translation>
     </message>
     <message>
         <source>Togo</source>
         <translation>Togo</translation>
     </message>
     <message>
         <source>Tokelau</source>
         <translation>Tokelau</translation>
     </message>
     <message>
         <source>Tonga</source>
         <translation>Tonga</translation>
     </message>
     <message>
         <source>Tunisia</source>
         <translation>Túnez</translation>
     </message>
     <message>
         <source>Turkey</source>
         <translation>Turquía</translation>
     </message>
     <message>
         <source>Turkmenistan</source>
         <translation>Turkmenistan</translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation>Tuvalu</translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation>Uganda</translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation>Ucrania</translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation>Uruguay</translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation>Uzbekistan</translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation>Vanuatu</translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation>Venezuela</translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation>Islas Vírgenes</translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation>Sahara Occidental</translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation>Yemen</translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation>Yugoslavia</translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation>Zambia</translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation>Zimbabwe</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Cumpleaños</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Aniversario</translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation>Kuwait</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Desconocido</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Afghanistan</source>
         <translation>Afganistán</translation>
     </message>
     <message>
         <source>Antarctica</source>
         <translation>Antártida</translation>
     </message>
     <message>
         <source>Armenia</source>
         <translation>Armenia</translation>
     </message>
     <message>
         <source>Bolivia</source>
         <translation>Bolivia</translation>
     </message>
     <message>
         <source>Cameroon</source>
         <translation>Camerún</translation>
     </message>
     <message>
         <source>Ghana</source>
         <translation>Ghana</translation>
     </message>
     <message>
         <source>Guadeloupe</source>
         <translation>Guadalupe</translation>
     </message>
     <message>
         <source>Guinea-Bissau</source>
         <translation>Ginea-Bisau</translation>
     </message>
     <message>
         <source>Jamaica</source>
         <translation>Jamaica</translation>
     </message>
     <message>
         <source>Kiribati</source>
         <translation>Kiribati</translation>
     </message>
     <message>
         <source>Kyrgyzstan</source>
         <translation>Kyrgyzstan</translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
         <translation>Palestina</translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
         <translation>Islas Pitcairn</translation>
     </message>
     <message>
         <source>Vietnam</source>
         <translation>Vietnam</translation>
     </message>
     <message>
         <source>Press to enter last- middle and firstname</source>
         <translation>Pulse para introducir nombre y apellidos</translation>
     </message>
     <message>
         <source>Enter fullname directly ! If you have a lastname with multiple words ( for instance &quot;de la Guerra&quot;), please write &lt;lastname&gt;,&lt;firstnames&gt; like this: &quot;de la Guerra, Carlos Pedro&quot;</source>
         <translation>¡Introduzca el nombre completo directamente! Si los apellidos son varias palabras, por favor, escriba &lt;apellidos&gt;, &lt;nombres&gt; como en &quot;Fernández Barros, José Luis&quot;</translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation>El cargo..</translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation>Algo como &quot;jr.&quot;..</translation>
     </message>
     <message>
         <source>The working place of the contact</source>
         <translation>El lugar de trabajo del contacto</translation>
     </message>
     <message>
         <source>Press to select attribute to change</source>
         <translation>Pulse para seleccional el atributo a cambiar</translation>
     </message>
     <message>
         <source>Press to select how to store the name (and howto show it in the listview)</source>
         <translation>Pulse para seleccionar cómo almacenar el nombre (y cómo mostrarlo el la vista en lista)</translation>
     </message>
     <message>
         <source></source>
         <translation></translation>
     </message>
 </context>
 <context>
     <name>Opie</name>
     <message>
         <source>Contact</source>
         <translation type="unfinished">Contacto</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation type="unfinished">Contactos</translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation type="unfinished">Iniciar búsqueda</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation type="unfinished">Escribir Correo a</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation type="unfinished">Importar vCard</translation>
     </message>
     <message>
         <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
@@ -1,446 +1,361 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>AdvancedFm</source>
         <translation>Gestor de Ficheros Avanzado</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Fichero</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation>Mostrar ficheros ocultos</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>Crear directorio</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Renombrar</translation>
     </message>
     <message>
         <source>Run Command</source>
         <translation>Ejecutar comando</translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation>Ejecutar comando con salida</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamaño</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sí</translation>
     </message>
     <message>
         <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>
         <source>Ir sent.</source>
         <translation>Envío IR.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>Cambiar directorio</translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>Ejecutar</translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation>Abrir como texto</translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation>Crear enlace simbólico</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>Mover</translation>
     </message>
     <message>
         <source>File Info</source>
         <translation>Info fichero</translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation>Fijar permisos</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Propiedades</translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation>Emitir fichero</translation>
     </message>
     <message>
         <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>
         <source>Switch to View 2</source>
         <translation>Cambiar a la Vista 2</translation>
     </message>
     <message>
         <source>Not Yet Implemented</source>
         <translation>No Implementado Aún</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 does not exist&lt;/p&gt;</source>
         <translation>&lt;p&gt;%1 no existe&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 type="unfinished"></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;Imposible eliminar el directorio actual de los marcadores. ¡No está en los marcadores!&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Refresh</source>
         <translation>Actualizar</translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1 files?&lt;/p&gt;</source>
         <translation>&lt;p&gt;¿Está seguro de que desea borrar %1 archivos?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1 and all it&apos;s contents?&lt;/p&gt;</source>
         <translation>&lt;p&gt;¿Está seguro de que desea borrar %1 y todo su contenido?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1?&lt;/p&gt;</source>
         <translation>&lt;p&gt;¿Está seguro de que desea borrar %1?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Really copy %1 files?&lt;/p&gt;</source>
         <translation>&lt;p&gt;¿Está seguro de que desea copiar %1 archivos?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 already  exists. Ok to overwrite?&lt;/P&gt;</source>
         <translation>&lt;p&gt;%1 ya existe. ¿Desea sobrescribirlo?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;P&gt;Could not copy %1 to %2&lt;/P&gt;</source>
         <translation>&lt;p&gt;Imposible copiar %1 a %2&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Copy %1 As</source>
         <translation>Copiar %1 Como</translation>
     </message>
     <message>
         <source>&lt;P&gt; %1 already exists. Ok to overwrite?&lt;/p&gt;</source>
         <translation>&lt;p&gt;%1 ya existe. ¿Desea sobrescribirlo?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not copy %1 to %2&lt;/P&gt;</source>
         <translation>&lt;p&gt;Imposible copiar %1 a %2&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt; %1 already exists. Do you really want to delete it?&lt;/P&gt;</source>
         <translation>&lt;p&gt; %1 ya existe. ¿Está seguro de que desea borrarlo?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not move %1&lt;/p&gt;</source>
         <translation>&lt;p&gt;Imposible mover %1&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not copy %1 to %2&lt;/p&gt;</source>
         <translation>&lt;p&gt;Imposible copiar %1 a %2&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Salvar salida en fichero(sólo nombre)</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Salida</translation>
     </message>
     <message>
         <source>Process could not start</source>
         <translation>El proceso no pudo empezar</translation>
     </message>
     <message>
         <source>Error
 </source>
         <translation>Error
 </translation>
     </message>
     <message>
         <source>
 Finished
 </source>
         <translation>
 Finalizado
 </translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Fijar Permisos Fichero</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Fijar permisos para el fichero:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>propietario</translation>
     </message>
     <message>
         <source>group</source>
         <translation>grupo</translation>
     </message>
     <message>
         <source>others</source>
         <translation>otros</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Propietario</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Grupo</translation>
     </message>
     <message>
         <source>read</source>
         <translation>lectura</translation>
     </message>
     <message>
         <source>write</source>
         <translation>escritura</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>ejecución</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Aviso</translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation>Error - sin usuario</translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation>Error - sin grupo</translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation>Error fijando propietario o grupo</translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation>Error fijando modo</translation>
     </message>
     <message>
         <source>filePermissions</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,293 +1,233 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Appearance</name>
     <message>
         <source>Settings...</source>
         <translation>Configurar...</translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation>Esquema actual</translation>
     </message>
     <message>
         <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>
         <source>Drop down list</source>
         <translation>Lista donde soltar</translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation>Lista donde soltar con iconos</translation>
     </message>
     <message>
         <source>Top</source>
         <translation>Arriba</translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation>Abajo</translation>
     </message>
     <message>
         <source>Style</source>
         <translation>Estilo</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Letra</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Colores</translation>
     </message>
     <message>
         <source>Windows</source>
         <translation>Ventanas</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Avanzada</translation>
     </message>
     <message>
-        <source>Restart</source>
-        <translation 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.
 
 Nota: esta opción no está disponible en todos los estilos.</translation>
     </message>
     <message>
         <source>Window decorations control the way the application title bar and its buttons appear.
 
 Click here to select an available decoration.</source>
         <translation>Las decoraciones de ventana controlan la apariencia del título de la aplicación y sus botones.
 
 Pulse aquí para seleccionar una decoración disponible.</translation>
     </message>
     <message>
         <source>Select the desired name, style and size of the default font applications will use.</source>
         <translation>Seleccione el nombre, estilo y tamaño de letra predeterminado que desea.</translation>
     </message>
     <message>
         <source>Color schemes are a collection of colors which are used for various parts of the display.
 
 Click here to select an available scheme.</source>
         <translation>Los esquemas de color son una colección de colores que se usan en varias partes de la pantalla.
 
 Pulse aquí para seleccionar un esquema disponible.</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation>Pulse aquí para que las pestañas aparezcan en la parte superior de la ventana.</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation>Pulse aquí para que las pestañas aparezcan en la parte inferior de la ventana.</translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation>Esta en una ventana de previsualización. Vea la nueva apariencia mientras cambia las opciones.</translation>
     </message>
     <message>
         <source>Appearance Settings</source>
         <translation>Configuración de Apariencia</translation>
     </message>
     <message>
         <source>Rotation direction:</source>
         <translation>Dirección de rotación:</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>
         <translation>Editar esquema</translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation>Seleccione aquí un color para: </translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
         <translation>Muestra</translation>
     </message>
     <message>
         <source>Normal Item</source>
         <translation>Elemento normal</translation>
     </message>
     <message>
         <source>Disabled Item</source>
         <translation>Elemento desabilitado</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Menú</translation>
     </message>
     <message>
         <source>Normal Text</source>
         <translation>Texto normal</translation>
     </message>
     <message>
         <source>Highlighted Text</source>
         <translation>Texto resaltado</translation>
     </message>
     <message>
         <source>Button</source>
         <translation>Botón</translation>
     </message>
     <message>
         <source>Check Box</source>
         <translation>Caja comprobar</translation>
     </message>
     <message>
         <source>Sample window using the selected settings.</source>
         <translation>Ventana de muestra con la configuración seleccionada.</translation>
     </message>
 </context>
 </TS>
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
@@ -1,710 +1,670 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation>Filtro de Categorías</translation>
     </message>
     <message>
         <source>Select one or more groups</source>
         <translation>Seleccione uno o más grupos</translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation>Leyendo configuración...</translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancelar</translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
         <translation>Cerrar</translation>
     </message>
     <message>
         <source>Remove
 </source>
         <translation>Borrar
 </translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation>Instalar</translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation>Renovar</translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation>(Reinstalar)</translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation>(Renovar)</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation>Destino</translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation>Espacio disponible</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Salida</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Empezar</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opciones</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todo</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Texto</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation>Abortar</translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation>
 **** Usuario pulsó ABORTAR ****</translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation>**** Proceso abortado ****</translation>
     </message>
     <message>
         <source>Save output</source>
         <translation>Guardar salida</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Desconocido</translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation>%1 Kb</translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation>Opciones</translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation>Forzar dependencias</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation>Forzar reinstalar</translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation>Forzar borrar</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation>Forzar sobreescribir</translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation>Nivel de información</translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation>Sólo errores</translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation>Mensajes normales</translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation>Mensajes informativos</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation>Salida de soluciones</translation>
     </message>
 </context>
 <context>
     <name>Ipkg</name>
     <message>
         <source>Dealing with package %1</source>
         <translation>Tratando con el paquete %1</translation>
     </message>
     <message>
         <source>Removing symbolic links...
 </source>
         <translation>Eliminando enlaces simbólicos...
 </translation>
     </message>
     <message>
         <source>Creating symbolic links for %1.</source>
         <translation>Creando enlaces simbólicos para %1.</translation>
     </message>
     <message>
         <source>Creating symbolic links for %1</source>
         <translation>Creando enlaces simbólicos para %1</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>Finalizado</translation>
     </message>
     <message>
         <source>Removing status entry...</source>
         <translation>Eliminando entrada de estado...</translation>
     </message>
     <message>
         <source>status file - </source>
         <translation>fichero de estado - </translation>
     </message>
     <message>
         <source>package - </source>
         <translation>paquete - </translation>
     </message>
     <message>
         <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>
         <translation type="unfinished">Enlace simbólico hecho con éxitoto
 </translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation>AQPkg - Gestor de Paquetes</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation>Escriba aquí el texto a buscar.</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation>Pulse aquí para esconder la barra Salto Rápido.</translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation>Actualizar listas</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation>Pulse aquí para actualizar las lista de paquetes de los servidores.</translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation>Renovar</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation>Pulse aquí para actualizar todos los paquetes instalados si se dispone de una nueva versión.</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Descargar</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation>Pulse aquí para descargar los paquetes seleccionados actualmente.</translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation>Aplicar cambios</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation>Pulse aquí para instalar, borrar o renovar los paquetes instalados actualmente.</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Acciones</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation>Mostrar paquetes no instalados</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation>Pulse aquí para mostrar los paquetes disponibles que no han sido instalados.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation>Mostrar paquetes instalados</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation>Pulse aquí para mostrar los paquetes actualmente instalados en este dispositivo.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation>Mostrar paquetes actualizados</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation>Pulse aquí para mostrar los paquetes actualmente instalados en este dispositivo que tienen una versión más nueva disponible.</translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation>Filtrar por categoría</translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation>Pulse aquí para listar paquetes que pertenecen a una categoría.</translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation>Fijar categoría del filtro</translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation>Pulse aquí para cambiar la categoría de paquetes que serán filtrados.</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Buscar</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation>Pulse aquí para buscar texto en el nombre de los paquetes.</translation>
     </message>
     <message>
         <source>Find next</source>
         <translation>Buscar siguiente</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation>Pulse aquí para buscar el siguiente nombre de paquete que contenga el texto que está buscando.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation>Teclas de Salto Rápido</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation>Pulse aquí para mostrar/esconder el teclado que permite moverse rápidamente a través de la lista de paquetes.</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Configurar</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation>Pulse aquí para configurar esta aplicación.</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation>Pulse aquí para esconder la barra de búsqueda.</translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation>Servidores:</translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation>Pulse aquí para seleccionar una fuente de paquetes.</translation>
     </message>
     <message>
         <source>Packages</source>
         <translation>Paquetes</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 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>Ésta es una lista de todos los paquetes del servidor selecionado arriba.
 
 Un punto azul junto al nombre del paquete indica que está instalado actualmente.
 
 Un punto azul con una estrella indica que hay una versión más moderna disponible.
 
 Pulse en el recuadro de la izquierda para seleccionar un paquete.</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation>Pulse aquí para desinstalar los paquetes seleccionados.</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation>Construyendo lista del servidor:
 <byte value="x9"/>%1</translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation>Construyendo lista de paquetes para:
 <byte value="x9"/>%1</translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
         <translation>Refrescando listas de paquetes del servidor</translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation>ATENCIÓN: ¡No se recomienda
 actualizar mientras
 Opie/Qtopia está corriendo!
 
 ¿Está seguro?</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Aviso</translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
         <translation>Renovando paquetes instalados</translation>
     </message>
     <message>
         <source>Are you sure you wish to delete
 %1?</source>
         <translation>¿Está seguro que desea borrar
 %1?</translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation>¿Está seguro?</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sí</translation>
     </message>
     <message>
         <source>Download to where</source>
         <translation>Descargar a dónde</translation>
     </message>
     <message>
         <source>Enter path to download to</source>
         <translation>Introduzca carpeta donde descargar</translation>
     </message>
     <message>
         <source>Install Remote Package</source>
         <translation>Instalar paquete remoto</translation>
     </message>
     <message>
         <source>Enter package location</source>
         <translation>Introduzca localización del paquete</translation>
     </message>
     <message>
         <source>Nothing to do</source>
         <translation>No hay nada que hacer</translation>
     </message>
     <message>
         <source>No packages selected</source>
         <translation>No hay paquetes seleccionados</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Do you wish to remove or reinstall
 %1?</source>
         <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>
         <translation>&lt;p&gt;&lt;b&gt;Instalado en&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Tamaño&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Selección&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Nombre de fichero&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Versión instalada&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Versión disponible&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>Package Information</source>
         <translation>Información del paquete</translation>
     </message>
     <message>
         <source>Package information is unavailable</source>
         <translation>No dispongo de información del paquete</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Cerrar</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Installed packages</source>
         <translation>Paquetes instalados</translation>
     </message>
     <message>
         <source>Local packages</source>
         <translation>Paquetes locales</translation>
     </message>
     <message>
         <source>N/A</source>
         <translation>N/D</translation>
     </message>
     <message>
         <source>Package - %1
               version - %2</source>
         <translation>Paquete - %1
              versión - %2</translation>
     </message>
     <message>
         <source>
               inst version - %1</source>
         <translation>
              versión inst - %1</translation>
     </message>
     <message>
         <source>Version string is empty.</source>
         <translation>Cadena de versión vacía.</translation>
     </message>
     <message>
         <source>Epoch in version is not number.</source>
         <translation>Época en versión no numérica.</translation>
     </message>
     <message>
         <source>Nothing after colon in version number.</source>
         <translation>Nada después del punto en el número de verisión.</translation>
     </message>
 </context>
 <context>
     <name>QuestionDlg</name>
     <message>
         <source>Remove</source>
         <translation>Borrar</translation>
     </message>
 </context>
 <context>
     <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation>Configuración</translation>
     </message>
     <message>
         <source>Servers</source>
         <translation>Servidores</translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation>Destinos</translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation>Proxies</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuevo</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Servidor</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nombre:</translation>
     </message>
     <message>
         <source>Address:</source>
         <translation>Dirección:</translation>
     </message>
     <message>
         <source>Active Server</source>
         <translation>Servidor activo</translation>
     </message>
     <message>
         <source>Update</source>
         <translation>Actualizar</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation>Destino</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Posición:</translation>
     </message>
     <message>
         <source>Link to root</source>
         <translation>Enlazar a root</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
         <translation>Proxy HTTP</translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation>Habilitada</translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation>Proxy FTP</translation>
     </message>
     <message>
         <source>Username:</source>
         <translation>Nombre usuario:</translation>
     </message>
     <message>
         <source>Password:</source>
         <translation>Clave:</translation>
     </message>
 </context>
 </TS>
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,189 +1,149 @@
 <!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>
     </message>
     <message>
         <source>Backup Failed!</source>
         <translation>¡Copia fallida!</translation>
     </message>
     <message>
         <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>
         <source>Restore Backup...</source>
         <translation>Restaurando...</translation>
     </message>
     <message>
         <source>&lt;qt&gt;%1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore</source>
         <translation type="unfinished">Restaurar</translation>
     </message>
     <message>
         <source>Would you really overwrite your local data?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <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>
         <source>&amp;OK</source>
         <translation>&amp;Ok</translation>
     </message>
 </context>
 </TS>
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,339 +1,331 @@
 <!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>
         <source>CE</source>
         <translation>CE</translation>
     </message>
     <message>
         <source>log</source>
         <translation>log</translation>
     </message>
     <message>
         <source>ln</source>
         <translation>ln</translation>
     </message>
     <message>
         <source>(</source>
         <translation>(</translation>
     </message>
     <message>
         <source>)</source>
         <translation>)</translation>
     </message>
     <message>
         <source>sin</source>
         <translation>sen</translation>
     </message>
     <message>
         <source>cos</source>
         <translation>cos</translation>
     </message>
     <message>
         <source>tan</source>
         <translation>tan</translation>
     </message>
     <message>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
         <source>+/-</source>
         <translation>+/-</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>=</source>
         <translation>=</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>.</source>
         <translation>.</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Distance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>acres</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&#xb0;C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>carats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&#xb0;F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>fl oz (US)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>g</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>gal (US)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>hectares</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>km</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>l</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>lb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lg tons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ml</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>naut. mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>oz</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>pt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>qt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq km</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq yd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>St tons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tblspoon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>teaspoons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tonnes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>yd</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,754 +1,646 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation>Chequera</translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation>Nueva chequera</translation>
     </message>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation>Transacciones</translation>
     </message>
     <message>
         <source>Charts</source>
         <translation>Gráficos</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nombre:</translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation>Introduzca aquí el nombre de la chequera.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation>Seleccione aquí el tipo de chequera.</translation>
     </message>
     <message>
-        <source>Savings</source>
-        <translation 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>
         <source>Enter account number for this checkbook here.</source>
         <translation>Introduzca aquí el nº de cuenta de esta chequera.</translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation>Número PIN:</translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation>Introduzca aquí el nº PIN de esta chequera.</translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation>Balance inicial: </translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation>Introduzca aquí el balance inicial de esta chequera.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notas:</translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation>Introduzca aquí culaquier información adicional de esta chequera.</translation>
     </message>
     <message>
-        <source>Current balance: %10.00</source>
-        <translation 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>
         <source>Description</source>
         <translation>Descripción</translation>
     </message>
     <message>
         <source>Amount</source>
         <translation>Cantidad</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuevo</translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation>Pulse aquí para añadir una nueva transacción.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation>Seleccione una transacción y pulse aquí para editarla.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation>Seleccione una chequera y pulse aquí para borrarla.</translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation>Seleccione el gráfico deseado y pulse el botón Dibujar.</translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation>Seleccione aquí el tipo de gráfico deseado.</translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation>Balance cuenta</translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation>Retiradas por categoría</translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation>Depósitos por categoría</translation>
     </message>
     <message>
         <source>Draw</source>
         <translation>Dibujar</translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation>Pulse aquí para dibujar el gráfico seleccionado.</translation>
     </message>
     <message>
-        <source>Current balance: %1%2</source>
-        <translation type="obsolete">Balance actual: %1%2</translation>
-    </message>
-    <message>
         <source>Delete transaction</source>
         <translation>Borrar transacción</translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation>Proteger con clave</translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation>Pulse aquí para des/habilitar protección con clave de esta chequera.</translation>
     </message>
     <message>
         <source>Num</source>
         <translation>Num</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Introduzca clave</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Por favor, introduzca su clave:</translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation>Confirme clave</translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation>Por favor, confirme su clave:</translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation>Por favor, introduzca su clave para deshabilitar la protección con clave:</translation>
     </message>
     <message>
         <source>Sort by:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select checkbook sorting here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entry Order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SortDate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Balance</source>
         <translation type="unfinished">Balance</translation>
     </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation>Configurar Chequera</translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation>Introduzca símbolo de la moneda:</translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation>Introduzca aquí su símbolo de moneda local.</translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation>Mostrar si la chequera está
 protegida con clave</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
         <translation>Pulse aquí para seleccionar si la ventana principal debe mostrar que la chequera está protegida con clave.</translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation>Mostrar balances chequera</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation>Pulse aquí para seleccionar si la ventana principal debe mostrar el balance actual para cada chequera.</translation>
     </message>
     <message>
         <source>&amp;Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Account Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Account Types</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Payees</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open last checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether the last open checkbook will be opened at startup.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show last checkbook tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save new description as payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to save new descriptions in the list of payess.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ListEdit</name>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Borrar</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation>Chequera</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nueva</translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation>Pulse aquí para crear una nueva chequera.
 
 Puede también seleccionar Nueva del menú.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation>Seleccione una chequera y pulse aquí para editarla.
 
 Puede también seleccionar Editar del menú, o mantener pulsado el nombre de la chequera.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation>Seleccione una chequera y pulse aquí para borrarla.
 
 Puede también seleccionar Borrar del menú.</translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation>Esta es una lista de todas las chequeras disponibles.</translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation>Borrar chequera</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Configurar</translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation>Pulse aquí para configurar esta aplicación.</translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation>Nobre de la chequera</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>Balance</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Introduzca clave</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Por favor, introduzca su clave:</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>Date</source>
         <translation type="unfinished">Fecha</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Editar</translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Borrar</translation>
     </message>
     <message>
         <source>Savings</source>
         <translation type="unfinished">Ahorros</translation>
     </message>
     <message>
         <source>Checking</source>
         <translation type="unfinished">Comprobando</translation>
     </message>
     <message>
         <source>CD</source>
         <translation type="unfinished">CD</translation>
     </message>
     <message>
         <source>Money market</source>
         <translation type="unfinished">Dinero mercado</translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation type="unfinished">Fondo mutuo</translation>
     </message>
     <message>
         <source>Other</source>
         <translation type="unfinished">Otro</translation>
     </message>
     <message>
         <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation type="unfinished">Automóvil</translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="unfinished">Facturas</translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="unfinished">CDs</translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="unfinished">Ropa</translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="unfinished">Ordenador</translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="unfinished">DVDs</translation>
     </message>
     <message>
         <source>Electronics</source>
         <translation type="unfinished">Electrónica</translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation type="unfinished">Diversión</translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="unfinished">Comida</translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="unfinished">Combustible</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished">Varios</translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="unfinished">Películas</translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="unfinished">Alquiler</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished">Viaje</translation>
     </message>
     <message>
         <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished">Trabajo</translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation type="unfinished">Miembro familiar</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation type="unfinished">Crédito misc</translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation>Transacción para </translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation>Retirada</translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation>Seleccione aquí si la transacción es un depósito o una retirada.</translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation>Depósito</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Fecha:</translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation>Seleccione aquí la fecha de la transacción.</translation>
     </message>
     <message>
         <source>Number:</source>
         <translation>Número:</translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation>Introduzca aquí el nº del cheque.</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Descripción:</translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation>Introduzca aquí la descripción de la transacción.</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoría:</translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation>Seleccione aquí la categoría de la transacción.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation>Seleccione aquí el tipo de transacción.
 
 Las opciones disponibles varían según sea un depósito o una retirada.</translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation>Cantidad:</translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation>Introduzca aquí la cantidad de la transacción.
 
 El valor introducido debe siempre ser positivo.</translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation>Tasa:</translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation>Introduzca aquí cualquier tasa asociada a esta transacción.
 
 El valor introducido debe siempre ser positivo.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notas:</translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation>Introduzca aquí cualquier información adicional de esta transacción.</translation>
     </message>
     <message>
-        <source>Automobile</source>
-        <translation 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
@@ -1,287 +1,206 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AlarmDlg</name>
     <message>
         <source>Clock</source>
         <translation type="unfinished">Reloj</translation>
     </message>
     <message>
         <source>Snooze</source>
         <translation type="unfinished">Cabezadita</translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AlarmDlgBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>TextLabel1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Snooze</source>
         <translation type="unfinished">Cabezadita</translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thu</source>
         <comment>Thursday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fri</source>
         <comment>Friday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat</source>
         <comment>Saturday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sun</source>
         <comment>Sunday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lap/Split</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Daily Alarm:&lt;/b&gt;&lt;p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily alarm requires at least
 one day to be selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished">Todo</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished">Audio</translation>
     </message>
 </context>
 <context>
     <name>ClockBase</name>
     <message>
         <source>Clock</source>
         <translation type="unfinished">Reloj</translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stopwatch</source>
         <translation type="unfinished">Crono</translation>
     </message>
     <message>
         <source>Split</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished">Empezar</translation>
     </message>
     <message>
         <source>Starts and stops the stopwatch.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lap/Split</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Resets the stopwatch.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check to enable the daily alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the hour the alarm will sound.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the minute the alarm will sound.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished">AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished">PM</translation>
     </message>
     <message>
         <source>Days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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
@@ -1,859 +1,828 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation>Calendario</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuevo</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>Hoy</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Día</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Semana</translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation>Lista semanal</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mes</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Buscar</translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation>Duración de la cita más larga
 que el intervalo de repetición.</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>No puedo editar datos, estoy sincronizando</translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation>Editar cita</translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation> minutos)</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Sin espacio</translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation>Calendario es incapaz de
 salvar tus cambios.
 Libere espacio y vuelva a intentarlo.
 ¿Salir de todas formas?</translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation>(Desconocido)</translation>
     </message>
     <message>
         <source>Error!</source>
         <translation>¡Error!</translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation>Arréglalo</translation>
     </message>
     <message>
         <source>Continue</source>
         <translation>Continuar</translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation>Cita duplicada</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>Editar...</translation>
     </message>
     <message>
         <source>error box</source>
         <translation>diálogo de error</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation>L</translation>
     </message>
     <message>
         <source>T</source>
         <translation>M</translation>
     </message>
     <message>
         <source>W</source>
         <translation>M</translation>
     </message>
     <message>
         <source>F</source>
         <translation>V</translation>
     </message>
     <message>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Lunes</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Martes</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Miércoles</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Jueves</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Viernes</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sábado</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Domingo</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00p</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation>Inicio</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Fin</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Emitir</translation>
     </message>
     <message>
         <source>This is an all day event.</source>
         <translation>Esta cita dura todo el día.</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Hora</translation>
     </message>
     <message>
         <source> - </source>
         <translation> - </translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplicar</translation>
     </message>
     <message>
         <source>Beam this occurence</source>
         <translation>Emitir esta aparición</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation>:00 PM</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation>:00 AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Calendario</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>Preferencias</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation>Comienzo de las citas</translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation>Hora inicio:</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation>Configuración de la alarma</translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation>Prefijar alarma</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation> minutos</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Miscelánea</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>Estilo filas:</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Por omisión</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Medianas</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Grandes</translation>
     </message>
     <message>
         <source>Views</source>
         <translation>Vistas</translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation>Vista preferida:</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Día</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Semana</translation>
     </message>
     <message>
         <source>Week List</source>
         <translation>Lista semanal</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mes</translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation>Saltar a hora actual</translation>
     </message>
     <message>
         <source>Time display</source>
         <translation>Visualización de la hora</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ninguna</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Inicio</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation>Inicio-fin</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Por omisión</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Lugar:</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Oficina</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Casa</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoría:</translation>
     </message>
+    <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>
         <translation>s</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Ene-00. Ene</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
         <translation type="unfinished">LMXJVSDL</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstEvent</name>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Editar</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished">Duplicar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Borrar</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished">Emitir</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>s</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>S: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation>p</translation>
     </message>
-    <message>
-        <source>Mo</source>
-        <comment>Monday</comment>
-        <translation type="obsolete">Lu</translation>
-    </message>
-    <message>
-        <source>Tu</source>
-        <comment>Tuesday</comment>
-        <translation type="obsolete">Ma</translation>
-    </message>
-    <message>
-        <source>We</source>
-        <comment>Wednesday</comment>
-        <translation type="obsolete">Mi</translation>
-    </message>
-    <message>
-        <source>Th</source>
-        <comment>Thursday</comment>
-        <translation type="obsolete">Ju</translation>
-    </message>
-    <message>
-        <source>Fr</source>
-        <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>
         <source>Daily...</source>
         <translation>Cada día...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>Cada semana...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>Cada mes...</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>Cada año...</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>No repetir...</translation>
     </message>
     <message>
         <source>Start Time</source>
         <translation>Hora inicio</translation>
     </message>
     <message>
         <source>End Time</source>
         <translation>Hora fin</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>Nueva Cita</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Lugar</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Categoría</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Reunión</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Almuerzo</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Cena</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Viaje</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Oficina</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Casa</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>Ene 02 00</translation>
     </message>
     <message>
         <source>Start time</source>
         <translation type="unfinished">Hora inicio</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Todo</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Zona horaria</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Alarma</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation> minutos</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Silenciosa</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Audible</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Repetición</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>No repetir...</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Descripción </translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>Inicio - Fin </translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Nota...</translation>
     </message>
-    <message>
-        <source>Start Time</source>
-        <translation type="obsolete">Hora inicio</translation>
-    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Editar Nota</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Almuerzo</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Inicio</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Fin</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Cada</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 cada </translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>El %1 cada </translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>El %1 %1 de cada</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Cada </translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Lunes</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Martes</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Miércoles</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Jueves</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Viernes</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sábado</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Domingo</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>º</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>ª</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>ª</translation>
     </message>
     <message>
         <source>th</source>
         <translation>ª</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation>No repetir</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>Día(s)</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>semana(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Repetir cada</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Día</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>mes(es)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>año(s)</translation>
     </message>
     <message>
         <source>days</source>
         <translation>días</translation>
     </message>
     <message>
         <source>day</source>
         <translation>día</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>semanas</translation>
     </message>
     <message>
         <source>week</source>
         <translation>semana</translation>
     </message>
     <message>
         <source>month</source>
         <translation>mes</translation>
     </message>
     <message>
         <source>year</source>
         <translation>año</translation>
     </message>
     <message>
         <source> and </source>
         <translation> y </translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
 y </translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, y </translation>
     </message>
     <message>
         <source>on </source>
         <translation>en </translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Cita Periódica </translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nada</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Día</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Semana</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mes</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Año</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Cada:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Frecuencia</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Terminar el:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Sin final</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Repetir el</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Lun</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Mar</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Mié</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Jue</translation>
     </message>
     <message>
         <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>Every</source>
         <translation>Cada</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Var 1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>Var semana</translation>
     </message>
     <message>
         <source>months</source>
         <translation>meses</translation>
     </message>
     <message>
         <source>years</source>
         <translation>años</translation>
     </message>
 </context>
 </TS>
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
@@ -1,293 +1,249 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation>Selección de comandos</translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation>Comandos</translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Comandos&lt;/B&gt;:</translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Comandos sugeridos&lt;/B&gt;:</translation>
     </message>
 </context>
 <context>
     <name>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>
         <source>Tab</source>
         <translation>Tab</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Arriba</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Abajo</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Pegar</translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation>Mostar lista comandos</translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation>Ocultar lista comandos</translation>
     </message>
     <message>
-        <source>Tabs on Bottom</source>
-        <translation 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>
         <source>Cyan on White</source>
         <translation>Cian sobre blanco</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>Blanco sobre cian</translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation>Azul sobre negro</translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation>Ámbar sobre negro</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Colores</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Editar rápido</translation>
     </message>
     <message>
-        <source>Edit</source>
-        <translation 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>
         <source>ScrollBar</source>
         <translation>Barra desp</translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation>Mostar lista comandos</translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation>Ocultar lista comandos</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation>Personalizado</translation>
     </message>
     <message>
         <source>Command List</source>
         <translation>Lista comandos</translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation>Cortar línea</translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation>Timbre</translation>
     </message>
     <message>
-        <source>Tabs on Top</source>
-        <translation type="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>
         <source>Hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Pink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pink on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>new session</source>
         <translation>nueva sesión</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Fonts</source>
         <translation>Fuentes</translation>
     </message>
     <message>
         <source>Sessions</source>
         <translation>Sesiones</translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation>Pantalla Completa</translation>
     </message>
     <message>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>Editar...</translation>
     </message>
     <message>
         <source>History...</source>
         <translation>Historia...</translation>
     </message>
     <message>
         <source>To exit fullscreen, tap here.</source>
         <translation>Para salir del modo pantalla completa, pulse aquí.</translation>
     </message>
     <message>
         <source>History Lines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konsole </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Selección de comandos</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation>Añadir comando</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation>Comando a añadir:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/fifteen.ts b/i18n/es/fifteen.ts
index e63a22e..94d7706 100644
--- a/i18n/es/fifteen.ts
+++ b/i18n/es/fifteen.ts
@@ -1,100 +1,96 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FifteenConfigDialog</name>
     <message>
         <source>All Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select board background</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FifteenConfigDialogBase</name>
     <message>
         <source>Configure Fifteen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use a Custom Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Path:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Preview:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Grid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Rows:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
 <context>
     <name>PiecesTable</name>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Quince piezas</translation>
     </message>
     <message>
         <source>Congratulations!
 You win the game!</source>
         <translation>¡Enhorabuena!
 ¡Ganaste el juego!</translation>
     </message>
     <message>
         <source>R&amp;andomize Pieces</source>
         <translation>R&amp;evolver piezas</translation>
     </message>
     <message>
         <source>&amp;Reset Pieces</source>
         <translation>&amp;Colocar piezas</translation>
     </message>
 </context>
 </TS>
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
@@ -1,221 +1,181 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FormatterApp</name>
     <message>
         <source>Formatter</source>
         <translation>Formateador</translation>
     </message>
     <message>
         <source>Storage Type</source>
         <translation>Tipo almacenamiento</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Formatter Output</source>
         <translation>Salida del Formateador</translation>
     </message>
     <message>
         <source>Trying to umount.</source>
         <translation>Intentando desmontar.</translation>
     </message>
     <message>
         <source>umount failed!</source>
         <translation>¡Fallo al desmontar!</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
         <source>Could not umount.
 Device is busy!</source>
         <translation>No pude desmontar.
 ¡Dispositivo ocupado!</translation>
     </message>
     <message>
         <source>Trying to format.</source>
         <translation>Intentando formatear.</translation>
     </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>
         <source>Available: %1 kB ( %d mB)</source>
         <translation>Disponible: %1 KB ( %d MB)</translation>
     </message>
     <message>
         <source>CAUTION:
 Changing parameters on this
 page may cause your system
 to stop functioning properly!</source>
         <translation>ATENCIÓN:
 ¡Cambiar parámetros en esta página
 puede causar que su sistema
 deje de funcionar correctamente!</translation>
     </message>
     <message>
         <source>Format?</source>
         <translation>¿Formato?</translation>
     </message>
     <message>
         <source>
 with %1 filesystem?
 You will loose all data!!</source>
         <translation>
 con el sistema de ficheros %1?
 ¡¡Perderá todos los datos!!</translation>
     </message>
     <message>
         <source>Trying to umount %1.</source>
         <translation>Intentando desmontar %1.</translation>
     </message>
     <message>
         <source>Trying to mount %1.</source>
         <translation>Intentando montar %1.</translation>
     </message>
     <message>
         <source>%1
 has been successfully mounted.</source>
         <translation>%1
 ha sido montado con éxito.</translation>
     </message>
     <message>
         <source>Storage Type: %1</source>
         <translation>Tipo de almacenamiento: %1</translation>
     </message>
     <message>
         <source>Type: %1
 Formatted with %2
 %3, %4, %5</source>
         <translation>Tipo: %1
 Formateado con %2
 %3, %4, %5</translation>
     </message>
 </context>
 </TS>
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
@@ -1,56 +1,52 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GoMainWidget</name>
     <message>
         <source>New Game</source>
         <translation>Nuevo juego</translation>
     </message>
     <message>
         <source>Pass</source>
         <translation>Pasar</translation>
     </message>
     <message>
         <source>Resign</source>
         <translation>Rendirse</translation>
     </message>
     <message>
         <source>Two player option</source>
         <translation>Opción 2 jugadores</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Juego</translation>
     </message>
 </context>
 <context>
     <name>GoWidget</name>
     <message>
         <source>White %1, Black %2. </source>
         <translation>Blancas %1, Negras %2.</translation>
     </message>
     <message>
         <source>White wins.</source>
         <translation>Blancas ganan.</translation>
     </message>
     <message>
         <source>Black wins.</source>
         <translation>Negras ganan.</translation>
     </message>
     <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
@@ -1,68 +1,64 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KBill</name>
     <message>
         <source>kBill</source>
         <translation>kBill</translation>
     </message>
     <message>
         <source>New game</source>
         <translation>Nuevo juego</translation>
     </message>
     <message>
         <source>Pause game</source>
         <translation>Parar juego</translation>
     </message>
     <message>
         <source>Story of kBill</source>
         <translation>Historia de kBill</translation>
     </message>
     <message>
         <source>Rules</source>
         <translation>Reglas</translation>
     </message>
     <message>
         <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>
         <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 disguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>UI</name>
     <message>
         <source>After Level</source>
         <translation>Tras el nivel</translation>
     </message>
     <message>
         <source>Your score</source>
         <translation>Tu puntuación</translation>
     </message>
 </context>
 </TS>
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
@@ -1,296 +1,292 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KRFBConnection</name>
     <message>
         <source>Connected</source>
         <translation>Conectado</translation>
     </message>
     <message>
         <source>Connection Refused</source>
         <translation>Conexión reusada</translation>
     </message>
     <message>
         <source>Host not found</source>
         <translation>Máquina no encontrada</translation>
     </message>
     <message>
         <source>Read Error: QSocket reported an error reading
 data, the remote host has probably dropped the
 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>
         <source>Protocol Error: An unknown encoding was used by the server %1</source>
         <translation>Error de protocolo: Codificación desconocida del servidor %1</translation>
     </message>
     <message>
         <source>Waiting for server initialization...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KRFBLogin</name>
     <message>
         <source>Waiting for server version...</source>
         <translation>Esperando versión del servidor...</translation>
     </message>
     <message>
         <source>Error: Invalid server version, %1</source>
         <translation>Error: Versión del servidor no válida, %1</translation>
     </message>
     <message>
         <source>Error: Unsupported server version, %1</source>
         <translation>Error: Versión del servidor no contemplada,%1</translation>
     </message>
     <message>
         <source>Logged in</source>
         <translation>Sesión iniciada</translation>
     </message>
     <message>
         <source>Error: This server requires a password, but none has been specified.
 </source>
         <translation>Error: Este servidor requiere clave y no se ha especificado.
 </translation>
     </message>
     <message>
         <source>Error: The password you specified was incorrect.</source>
         <translation>Error: La clave especificada era incorrecta.</translation>
     </message>
     <message>
         <source>Error: Too many invalid login attempts have been made
 to this account, please try later.</source>
         <translation>Error: Demasiados intentos fallidos.
 Por favor, inténtelo más tarde.</translation>
     </message>
     <message>
         <source>Login Failed</source>
         <translation>Indentificación fallida</translation>
     </message>
     <message>
         <source>Too many failures</source>
         <translation>Demasiados fallos</translation>
     </message>
 </context>
 <context>
     <name>KVNC</name>
     <message>
         <source>VNC Viewer</source>
         <translation>Visor VNC</translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation>Pantalla completa</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>Desconectar</translation>
     </message>
     <message>
         <source>Stop Full Screen</source>
         <translation>Pantalla normal</translation>
     </message>
     <message>
         <source>Connected to remote host</source>
         <translation>Conectado a máquina remota</translation>
     </message>
     <message>
         <source>Logged in to remote host</source>
         <translation>Identificado en máquina remota</translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation>Conexión cerrada</translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation>Nueva conexión</translation>
     </message>
     <message>
         <source>Open Bookmark</source>
         <translation>Abrir marcador</translation>
     </message>
     <message>
         <source>Delete Bookmark</source>
         <translation>Borrar marcador</translation>
     </message>
     <message>
         <source>Send Contrl-Alt-Delete</source>
         <translation>Enviar Ctrl+Alt+Borrar</translation>
     </message>
     <message>
         <source>Next Click is Double Click</source>
         <translation>Siguiente clic es doble</translation>
     </message>
     <message>
         <source>Next Click is Right Click</source>
         <translation>Siguiente clic es botón derecho</translation>
     </message>
 </context>
 <context>
     <name>KVNCBookmarkDlgBase</name>
     <message>
         <source>Bookmarks</source>
         <translation>Marcadores</translation>
     </message>
     <message>
         <source>Choose a bookmark that you would like to open</source>
         <translation>Elija un marcador que le gustaría abrir</translation>
     </message>
 </context>
 <context>
     <name>KVNCConnDlgBase</name>
     <message>
         <source>VNC Viewer Connection</source>
         <translation>Conexión Visor VNC</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Servidor</translation>
     </message>
     <message>
         <source>Show Password</source>
         <translation>Mostar contraseña</translation>
     </message>
     <message>
         <source>Password:</source>
         <translation>Contraseña:</translation>
     </message>
     <message>
         <source>Bookmark Name:</source>
         <translation>Nombre marcador:</translation>
     </message>
     <message>
         <source>Host Name:</source>
         <translation>Nombre máquina:</translation>
     </message>
     <message>
         <source>Display Number:</source>
         <translation>Número pantalla:</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opciones</translation>
     </message>
     <message>
         <source>Check for screen updates every:</source>
         <translation>Comprobar pantalla cada:</translation>
     </message>
     <message>
         <source>Milliseconds</source>
         <translation>Milisegundos</translation>
     </message>
     <message>
         <source>Request 8-bit session</source>
         <translation>Solicitar sesión 8 bits</translation>
     </message>
     <message>
         <source>Raise on bell</source>
         <translation>Modo escucha</translation>
     </message>
     <message>
         <source>Request shared session</source>
         <translation>Solicitar sesión compartida</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>Scale Factor</source>
         <translation>Factor de escala</translation>
     </message>
     <message>
         <source>Encodings</source>
         <translation>Codificaciones</translation>
     </message>
     <message>
         <source>Hextile encoding</source>
         <translation>Codificación Hextile</translation>
     </message>
     <message>
         <source>CoRRE encoding</source>
         <translation>Codificación CoRRE</translation>
     </message>
     <message>
         <source>RRE encoding</source>
         <translation>Codificación RRE</translation>
     </message>
     <message>
         <source>Copy rectangle encoding</source>
         <translation>Codificación copiar rectángulo</translation>
     </message>
     <message>
         <source>The password of the VNC server</source>
         <translation>La clave del servidor VNC</translation>
     </message>
     <message>
         <source>Toggle obscuring the password</source>
         <translation>Conmutar ocultar la clave</translation>
     </message>
     <message>
         <source>The name of the VNC server</source>
         <translation>El nombre del servidor VNC</translation>
     </message>
     <message>
         <source>The host name of the VNC server</source>
         <translation>El nombre de la máquina servidor VNC</translation>
     </message>
     <message>
         <source>The display number of the VNC server</source>
         <translation>El número de pantalla del servidor VNC</translation>
     </message>
     <message>
         <source>Delay between requesting updates from the server</source>
         <translation>Retrardo entre peticiones de actualización del servidor</translation>
     </message>
     <message>
         <source>Request that the VNC server transfer 8 bit color</source>
         <translation>Solicitar que el servidor VNC envíe color de 8 bits</translation>
     </message>
     <message>
         <source>Allow other users to connect to the VNC server</source>
         <translation>Permitir a otros usuarios conectarse al servidor VNC</translation>
     </message>
     <message>
         <source>Scale the remote display to fit on the PDA (Slow)</source>
         <translation>Escalar la pantalla remota para que encaje en la PDA (lento)</translation>
     </message>
     <message>
         <source>Enable transmiting identical rectangles as references to existing data</source>
         <translation>Habilitar transmisión de rectángulos idénticos como referencia a datos existentes</translation>
     </message>
 </context>
 </TS>
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
@@ -1,286 +1,278 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DocTabSettings</name>
     <message>
         <source>Enable the Documents Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check, if you want the Documents Tab to be visible.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputMethodSettings</name>
     <message>
         <source>Resize application on Popup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable floating and resizing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check, if you want the application to be automatically resized if the input method pops up.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check, if you want to move and/or resize input methods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Specify the percentage of the screen width for the input method</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherSettings</name>
     <message>
         <source>Launcher Settings</source>
         <translation>Configuración del Lanzador</translation>
     </message>
     <message>
         <source>Taskbar</source>
         <translation>Barra de tareas</translation>
     </message>
     <message>
         <source>O-Menu</source>
         <translation>Menú O</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Pestañas</translation>
     </message>
     <message>
         <source>InputMethods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MenuSettings</name>
     <message>
         <source>Load applets in O-Menu:</source>
         <translation>Cargar applets en el Menú O:</translation>
     </message>
     <message>
         <source>Show Launcher tabs in O-Menu</source>
         <translation>Mostrar pestañas del lanzador en el Menú O</translation>
     </message>
     <message>
         <source>Check the applets that you want to have included in the O-Menu.</source>
         <translation>Verificar los applets que quiere incluir en el Menú O.</translation>
     </message>
     <message>
         <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
         <translation>Añadir el contenido de las pestañas del Lanzador como menú en el Menú O.</translation>
     </message>
     <message>
         <source>Show Applications in Subpopups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Sample 1</source>
         <translation>Muestra 1</translation>
     </message>
     <message>
         <source>Sample 2</source>
         <translation>Muestra 2</translation>
     </message>
     <message>
         <source>Sample 3</source>
         <translation>Muestra 3</translation>
     </message>
 </context>
 <context>
     <name>TabDialog</name>
     <message>
         <source>Edit Tab</source>
         <translation>Pestaña Editar</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>Fondo</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Letra</translation>
     </message>
     <message>
         <source>Icons</source>
         <translation>Inconos</translation>
     </message>
     <message>
         <source>Previewing %1</source>
         <translation>Vista previa %1</translation>
     </message>
     <message>
         <source>This is a rough preview of what the currently selected Tab will look like.</source>
         <translation>Esta es una somera visión de como se verá la pestaña seleccionada.</translation>
     </message>
     <message>
         <source>Use a custom font</source>
         <translation>Usar una letra personalizada</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
         <source>Ruled</source>
         <translation>Reglado</translation>
     </message>
     <message>
         <source>Solid color</source>
         <translation>Color sólido</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Imagen</translation>
     </message>
     <message>
         <source>Select...</source>
         <translation>Seleccionar...</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Predeterminado</translation>
     </message>
     <message>
         <source>Size:</source>
         <translation>Tamaño:</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Pequeño</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Grande</translation>
     </message>
     <message>
         <source>Color:</source>
         <translation>Color:</translation>
     </message>
     <message>
         <source>Columns:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatic</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TabsSettings</name>
     <message>
         <source>Launcher Tabs:</source>
         <translation>Pestañas del Lanzador:</translation>
     </message>
     <message>
         <source>foobar</source>
         <translation>barra tonta</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuevo</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Enable big busy indicator</source>
         <translation>Habilitar indicador de ocupado grande</translation>
     </message>
     <message>
-        <source>Enable blinking busy indicator</source>
-        <translation 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>
         <source>Not implemented yet</source>
         <translation>No implementado todavía</translation>
     </message>
     <message>
         <source>Enable animated busy indicator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Activate this, if you want an animatedbusy indicator for starting applications in the Launcher.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable static background pixmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Activate this, if you want the background pixmap not to scroll with the icons.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskbarSettings</name>
     <message>
         <source>Load applets in Taskbar:</source>
         <translation>Cargar applets el la barra de tareas:</translation>
     </message>
     <message>
         <source>Check the applets that you want displayed in the Taskbar.</source>
         <translation>Compruebe los applets que quiere ver en la barra de tareas.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libaboutapplet.ts b/i18n/es/libaboutapplet.ts
index 7b40f83..fc023eb 100644
--- a/i18n/es/libaboutapplet.ts
+++ b/i18n/es/libaboutapplet.ts
@@ -1,104 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AboutApplet</name>
     <message>
         <source>About shortcut</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <translation type="unfinished"></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="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.2&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished">&lt;center&gt;&lt;b&gt;E {1.2?}</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;Alberto &apos;Skyhusker&apos; Garcia Hierro&lt;/b&gt; (skyhusker@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="unfinished"></translation>
     </message>
 </context>
 </TS>
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,110 +1,86 @@
 <!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>
         <source>Very Low</source>
         <translation>Muy bajo</translation>
     </message>
     <message>
         <source>Critical</source>
         <translation>Crítico</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Desconocido</translation>
     </message>
     <message>
         <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>
         <source>Remaining Power: %1%</source>
         <translation>Batería Restante: %1%</translation>
     </message>
     <message>
         <source>Remaining Time: %1m %2s</source>
         <translation>Tiempo Restante: %1m %2s</translation>
     </message>
     <message>
         <source>Remaing Power: %1 %2
 Remaining Time: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ipaq  %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,1158 +1,727 @@
 <!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>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished">Semana</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished">Mes</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished">Año</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished">Cada:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished">Frecuencia</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished">Finalizar el:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">Sin fecha final</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">Repetir el</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">Lun</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">Mar</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">Mie</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">Jue</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">Vie</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">Sáb</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">Dom</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">Cada</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished">Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished">VarSemana</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">Sin fecha final</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished">días</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished">día</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished">semanas</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished">semana</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished">meses</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished">mes</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished">años</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished">año</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished"> y </translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished">,
 y </translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished">, y </translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished">en </translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished">No repetir</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished">día(s)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">Repetir el</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">Lun</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">Mar</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">Mie</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">Jue</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">Vie</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">Sáb</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">Dom</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished">semana(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished">Repetir cada</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">Día</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Fecha</translation>
     </message>
     <message>
         <source>month(s)</source>
         <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>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to edit the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to duplicate the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to delete the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to transmit the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</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">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>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Baja</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation>Muy baja</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Progreso:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Fecha lí­mite:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoría:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation>Correo-e preferido: </translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Oficina: </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Web trabajo: </translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Teléfono trabajo: </translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Fax trabajo: </translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Móvil trabajo: </translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Busca trabajo: </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Página web personal: </translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Teléfono casa: </translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Fax casa: </translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Móvil personal: </translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation>Todos correos-e: </translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Profesión: </translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Ayudante: </translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Superior: </translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Hombre</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Mujer</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Género: </translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Cónyuge: </translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Cumpleaños: </translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Aniversario: </translation>
     </message>
     <message>
         <source>Children: </source>
         <translation>Hijos: </translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Apodo: </translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notas: </translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Localidad: </translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation>Esta cita dura todo el día</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation>Esta cita dura varios días</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation>Inicio:</translation>
     </message>
     <message>
         <source>End:</source>
         <translation>Final:</translation>
     </message>
     <message>
         <source>Note:</source>
         <translation>Nota:</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Cada</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 cada </translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>El %1 cada </translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Cada </translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Lunes</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Martes</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Miércoles</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Jueves</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Viernes</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sábado</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Domingo</translation>
     </message>
     <message>
-        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
-        <translation 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>
         <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profession</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Has a due-date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No due-date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No reccurrence</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No start-date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No completed-date</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>º</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>º</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>º</translation>
     </message>
     <message>
         <source>th</source>
         <translation>º</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libopieui2.ts b/i18n/es/libopieui2.ts
index 854ddfe..fe4db25 100644
--- a/i18n/es/libopieui2.ts
+++ b/i18n/es/libopieui2.ts
@@ -1,829 +1,175 @@
 <!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>
     </message>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished">Nombre</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished">Tamaño</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Fecha</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished">Tipo mime</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished">Diálogo Fichero</translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished">Abrir</translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished">Guardar</translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished">Nombre:</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation type="unfinished">Estilo</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished">Tamaño</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished">El Zorro Marrón Saltó Sobre El Perro Perezoso</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="unfinished">Nombre</translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished"></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="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
@@ -1,1035 +1,993 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation>Todas</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>En blanco</translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation> (multi.)</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Trabajo</translation>
     </message>
     <message>
         <source>Personal</source>
         <translation>Personal</translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation> (Multi.)</translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation>Todas</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>Nueva categoría</translation>
     </message>
     <message>
         <source>New Category </source>
         <translation>Nueva categoría </translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation>Editar Categoría</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>Categorías</translation>
     </message>
     <message>
         <source>Application</source>
         <translation>Aplicación</translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation>Aquí van las categorías</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Añadir</translation>
     </message>
     <message>
         <source>Global</source>
         <translation>Global</translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation>Verificar las categorías a las que pertenece este documento.</translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation>Introduzca una nueva categoría aquí. Pulse &lt;b&gt;Añadir&lt;/b&gt; para sumarla a la lista.</translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation>Introduzca una nueva categoría a la izquierda y pulse para sumarla a la lista.</translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation>Pulse para borrar la categoría resaltada.</translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation>Verificar que esta propiedad está disponible en todas las aplicaciones.</translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation>Todo</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>En blanco</translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation>Lo siento, otra aplicación está
 editando las categorías.</translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation>Editar Categorías</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todas</translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation>Mostar Enero del año seleccionado</translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation>Mostar el mes anterior</translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation>Mostar el mes siguiente</translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation>Mostar Diciembre del año seleccionado</translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation>Cerrar selección fichero</translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation>Mostar documentos de este tipo</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Ver documento</translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation>Mostar documentos de esta categoría</translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation>Pulse para seleccionar un documento de la lista</translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation>, o selecione &lt;b&gt;Nuevo dcumento&lt;/b&gt; para crearlo.</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation>&lt;br&gt;&lt;br&gt;Mantenga pulsado para las propiedades del documento.</translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <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>
         <source>Find what:</source>
         <translation>Qué buscar:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoría:</translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation>Iniciar búsqueda el:</translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation>Dic 02 01</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Distinguir may/min</translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation>Buscar hacia atrás</translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Document View</source>
         <translation>Ver documento</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation>Falló al borrar fichero.</translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation>Copiar de </translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplicar</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>Fallo al copiar fichero.</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Detalles</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>Fallo al mover documento.</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Disco duro</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Propiedades</translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation>Detalles</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>Comentario:</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nombre:</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Localización:</translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation>Carga rápida (consume memoria)</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Emitir</translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation>El medio en el que reside el documento.</translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation>El nombre de este documento.</translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation>Precargar esta aplicación para disponibilidad instantánea.</translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation>Borrar este documento.</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation>Hacer una copia de este documento.</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation>Emitir este documento a otro dispositivo.</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation>Usar rotación personalizada</translation>
     </message>
     <message>
         <source>Arguments:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>Información del propietario</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Introduzca código</translation>
     </message>
 </context>
 <context>
     <name>QMessageBox</name>
     <message>
         <source>Yes</source>
         <translation>Sí</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Sin espacio</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>Hubo un problema creando
 la información de configuración
 de este programa.
 
 Por favor, libere espacio e
 inténtelo de nuevo.</translation>
     </message>
     <message>
         <source>Unable to create start up files
 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>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Dirección casa:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation>Correos-e: </translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Teléfono casa: </translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Fax casa: </translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Móvil personal: </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Web personal: </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Web trabajo: </translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Oficina: </translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Teléfono trabajo: </translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Fax trabajo: </translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Móvil trabajo: </translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Busca trabajo: </translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Profesión: </translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Ayudante: </translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Superior: </translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Hombre</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Mujer</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Género: </translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Cónyuge: </translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Cumpleaños: </translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Aniversario: </translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Apodo: </translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Título</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>2º nombre</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Apellidos</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Sufijo</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Archivar como</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Cargo</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Departamento</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Compañía</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Teléfono trabajo</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Fax trabajo</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Móvil trabajo</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>Correo-e omisión</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>Correos-e</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Teléfono casa</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Fax casa</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Móvil personal</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Calle trabajo</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Ciudad trabajo</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>Provincia trabajo</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>CP trabajo</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>País trabajo</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Busca trabajo</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Web trabajo</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Oficina</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Profesión</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Ayudante</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Superior</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Calle casa</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Ciudad casa</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>Provincia casa</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>Cód.portal casa</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>País casa</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Web personal</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Cónyuge</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Género</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Cumpleaños</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Aniversario</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Apodo</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Hijos</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Grupos</translation>
     </message>
     <message>
         <source>New Document</source>
         <translation>Nuevo documento</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Lun</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Mar</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Mie</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Jue</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <source>Jan</source>
         <translation>Ene</translation>
     </message>
     <message>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
         <source>Apr</source>
         <translation>Abr</translation>
     </message>
     <message>
         <source>May</source>
         <translation>May</translation>
     </message>
     <message>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
         <source>Aug</source>
         <translation>Ago</translation>
     </message>
     <message>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
         <source>Oct</source>
         <translation>Oct</translation>
     </message>
     <message>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
         <source>Dec</source>
         <translation>Dic</translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation type="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>
     <message>
         <source>%1 document</source>
         <translation>%1 documento</translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation type="unfinished">Pulse para cerrar esta ventana, descartando los cambios.</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation type="unfinished">Pulse para cerrar esta ventana.</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation type="unfinished">Pulse para cerrar esta ventana y aplicar los cambios.</translation>
     </message>
     <message>
         <source>Click to make this window movable.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
         <translation type="unfinished">Pulse para hacer que esta ventana use toda la pantalla disponible.</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maximize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>Tarjeta CF</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Disco duro</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>Tarjeta SD</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>Disco duro SCSI</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Almacenamiento interno</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>Memoria interna</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>Tarjeta MMC</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>Ninguno</translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation>no encontré el ejecutable Reloj Mundial</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation>Para elegir las zonas horarias, por favor
 instale el Reloj Mundial (citytime).</translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Sin espacio</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Incapaz de programar alarma.
 Libere memoria e inténtelo de nuevo</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>%1 ficheros</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>%1 %2</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>Todos los %1 ficheros</translation>
     </message>
     <message>
         <source>All files</source>
         <translation>Todos los ficheros</translation>
     </message>
 </context>
 <context>
     <name>WindowDecoration</name>
     <message>
         <source>Default</source>
         <comment>List box text for default window decoration</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,114 +1,102 @@
 <!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>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation>¡Este color será usado al mostrar cumpleaños/aniversarios!</translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation>Fijar urgente
 Color si debajo</translation>
     </message>
     <message>
         <source> days: </source>
         <translation>Días: </translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation>¡Este color urgente será usado si estamos cerca de la cita!</translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation>¡El color urgente será usado si el cumpleaños/aniversario está más próximo que los días dados!</translation>
     </message>
     <message>
         <source>Enable/Disable Views</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show &amp;Birthdays</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show &amp;Anniveraries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The next birthdays will just be shown, if enabled!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The next anniversaries will just be shown, if enabled !</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>AddressBook plugin</source>
         <translation>Módulo LibretaDirecciones</translation>
     </message>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>Próximos cumpleaños en &lt;b&gt; %1 &lt;/b&gt; días:</translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>¡Sin cumpleaños en &lt;b&gt; %1 &lt;/b&gt; días!</translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>Próximos aniversarios en &lt;b&gt; %1 &lt;/b&gt; días:</translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>¡Sin aniversarios en &lt;b&gt; %1 &lt;/b&gt; días!</translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation>¡La base de datos no facilita esta petición de búsqueda! ¡Por favor, actualice libOpie!&lt;br&gt;</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libtodaydatebookplugin.ts b/i18n/es/libtodaydatebookplugin.ts
index 8d1a8f3..7fd84ec 100644
--- a/i18n/es/libtodaydatebookplugin.ts
+++ b/i18n/es/libtodaydatebookplugin.ts
@@ -1,146 +1,87 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <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>
     </message>
     <message>
         <source>Show notes</source>
         <translation>Mostrar notas</translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
         <translation>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>Mostrar sólo últimas citas</translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
         <translation>Verifique esto si sólo las citas porteriores al momento actual deben ser mostradas</translation>
     </message>
     <message>
         <source>Show time in extra line</source>
         <translation>Mostrar hora en línea extra</translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
         <translation>Cuántas citas deben ser mostradas como máximo. En orden cronológico</translation>
     </message>
     <message>
         <source>How many appointment should be shown?</source>
         <translation>¿Cuántas citas deben ser mostradas?</translation>
     </message>
     <message>
         <source>only today</source>
         <translation>sólo hoy</translation>
     </message>
     <message>
         <source>How many more days should be in the range</source>
         <translation>Cuántos días más deben estar en el rango</translation>
     </message>
     <message>
         <source>How many more days</source>
         <translation>Cuántos días mas</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Datebook plugin</source>
         <translation>Módulo Agenda</translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation>No hay más citas hoy</translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation>Sin citas hoy</translation>
     </message>
 </context>
 </TS>
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
@@ -1,59 +1,40 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>Todolist plugin</source>
         <translation>Módulo ListaTareas</translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation>Hay &lt;b&gt; 1&lt;/b&gt; tarea activa:  &lt;br&gt;</translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation>Hay &lt;b&gt; %1&lt;/b&gt; tareas activas: &lt;br&gt;</translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation>Sin tareas activas</translation>
     </message>
 </context>
 <context>
     <name>TodoPluginConfigBase</name>
     <message>
         <source>Set the maximum number of task that should be shown</source>
         <translation>Fija el número máximo de tareas que deben mostrarse</translation>
     </message>
     <message>
         <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
@@ -1,121 +1,117 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>Weather plugin</source>
         <translation>Módulo Tiempo</translation>
     </message>
 </context>
 <context>
     <name>WeatherPluginConfig</name>
     <message>
         <source>Enter ICAO location identifier:</source>
         <translation>Introduzca identificador de localidad ICAO:</translation>
     </message>
     <message>
         <source>Enter the 4 letter code for the desired location here.  See http://www.nws.noaa.gov/tg/siteloc.shtml to find a location near you.</source>
         <translation>Introduzca el código de 4 letras de la localización deseada. Vea http://www.nws.noaa.gov/tg/siteloc.shtml para buscar una localidad próxima.</translation>
     </message>
     <message>
         <source>Visit http://www.nws.noaa.gov/tg/siteloc.shtml to find the nearest location.</source>
         <translation>Visite http://www.nws.noaa.gov/tg/siteloc.shtml para buscar la locaridad más cercana.</translation>
     </message>
     <message>
         <source>Use metric units</source>
         <translation>Usar unidades métricas</translation>
     </message>
     <message>
         <source>Click here to select type of units displayed.</source>
         <translation>Pulse aquí para seleccionar el tipo de unidades mostradas.</translation>
     </message>
     <message>
         <source>Update frequency (in minutes):</source>
         <translation>Frecuencia de ctualización (en minutos): </translation>
     </message>
     <message>
         <source>Select how often (in minutes) you want the weather to be updated.</source>
         <translation>Seleccione la frecuencia (en minutos) con la que quiere que el Tiempo sea actualizado.</translation>
     </message>
 </context>
 <context>
     <name>WeatherPluginWidget</name>
     <message>
         <source>Retreiving current weather information.</source>
         <translation>Recuperando información meteorológica actual.</translation>
     </message>
     <message>
         <source>Temp: </source>
         <translation>Temp: </translation>
     </message>
     <message>
         <source>  Wind: </source>
         <translation>Viento: </translation>
     </message>
     <message>
         <source>
 Pres: </source>
         <translation>
 Pres: </translation>
     </message>
     <message>
         <source>Current weather data not available.</source>
         <translation>Datos meteorológicos actuales no disponibles.</translation>
     </message>
     <message>
         <source>n/a</source>
         <translation>n/d</translation>
     </message>
     <message>
         <source>E </source>
         <translation>E</translation>
     </message>
     <message>
         <source>NE </source>
         <translation>NE</translation>
     </message>
     <message>
         <source>N </source>
         <translation>N</translation>
     </message>
     <message>
         <source>NW </source>
         <translation>NO</translation>
     </message>
     <message>
         <source>W </source>
         <translation>O</translation>
     </message>
     <message>
         <source>SW </source>
         <translation>SO</translation>
     </message>
     <message>
         <source>S </source>
         <translation>S</translation>
     </message>
     <message>
         <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
@@ -1,48 +1,36 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MindBreaker</name>
     <message>
         <source>New Game</source>
         <translation>Nuevo juego</translation>
     </message>
     <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>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
 </context>
 </TS>
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,37 +1,33 @@
 <!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>
         <source>Game</source>
         <translation>Nivel</translation>
     </message>
     <message>
         <source>Mine Sweep</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -410,523 +410,503 @@
     <message>
         <source>Device</source>
         <translation>Dispositivo</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Configure Profiles</source>
         <translation>Configuración de perfiles</translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation>Nueva conexión</translation>
     </message>
     <message>
         <source>Save Connection</source>
         <translation>Salvar conexión</translation>
     </message>
     <message>
         <source>Connect</source>
         <translation>Conectar</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>Desconectar</translation>
     </message>
     <message>
         <source>QuickLaunch</source>
         <translation>LanzadorRápido</translation>
     </message>
     <message>
         <source>The shell button launches the &quot;default&quot; profile. If there is none default values are taken</source>
         <translation>El botón de la concha lanza el perfil preferido. Si no hay ninguno se toman los valores por defecto</translation>
     </message>
     <message>
         <source>Transfer file...</source>
         <translation>Transferir fichero...</translation>
     </message>
     <message>
         <source>Line wrap</source>
         <translation>Cortar líneas</translation>
     </message>
     <message>
         <source>Full screen</source>
         <translation>Pantalla completa</translation>
     </message>
     <message>
         <source>Save history</source>
         <translation>Guardar historial</translation>
     </message>
     <message>
         <source>Terminate</source>
         <translation>Terminar</translation>
     </message>
     <message>
         <source>Close Window</source>
         <translation>Cerrar ventana</translation>
     </message>
     <message>
         <source>Run Script</source>
         <translation>Ejecutar script</translation>
     </message>
     <message>
         <source>Record Script</source>
         <translation>Regisrar script</translation>
     </message>
     <message>
         <source>Save Script</source>
         <translation>Salvar script</translation>
     </message>
     <message>
         <source>Open Keyboard...</source>
         <translation>Abrir teclado...</translation>
     </message>
     <message>
         <source>New from Profile</source>
         <translation>Nueva del perfil</translation>
     </message>
     <message>
         <source>Connection</source>
         <translation>Conexión</translation>
     </message>
     <message>
         <source>Scripts</source>
         <translation>Scripts</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Pegar</translation>
     </message>
     <message>
         <source>Script</source>
         <translation>Script</translation>
     </message>
     <message>
         <source>&lt;qt&gt;There is no Connection.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;No hay conexión.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>History</source>
         <translation>Historial</translation>
     </message>
     <message>
         <source>New Profile</source>
         <translation>Nuevo perfil</translation>
     </message>
     <message>
         <source>Save Profile</source>
         <translation>Guardar perfil</translation>
     </message>
     <message>
         <source>Start log</source>
         <translation>Comenzar registro</translation>
     </message>
     <message>
         <source>Stop log</source>
         <translation>Terminar registro</translation>
     </message>
     <message>
         <source>Log</source>
         <translation>Registro</translation>
     </message>
 </context>
 <context>
     <name>ModemConfigWidget</name>
     <message>
         <source>Modem is attached to:</source>
         <translation>Modem unido a:</translation>
     </message>
     <message>
         <source>Enter telefon number here:</source>
         <translation>Introduzca aquí el nº de teléfono:</translation>
     </message>
     <message>
         <source>AT commands</source>
         <translation>Comandos AT</translation>
     </message>
     <message>
         <source>Enter number</source>
         <translation>Introducta número</translation>
     </message>
 </context>
 <context>
     <name>NoOptions</name>
     <message>
         <source>This Plugin does not support any configurations</source>
         <translation>Este módulo no puede configurarse</translation>
     </message>
 </context>
 <context>
     <name>ProfileEditorDialog</name>
     <message>
         <source>Connection</source>
         <translation>Conexión</translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
         <source>Auto connect after load</source>
         <translation>Auto conectar tras la carga</translation>
     </message>
     <message>
         <source>Local Console</source>
         <translation>Consola local</translation>
     </message>
     <message>
         <source>New Profile</source>
         <translation>Nuevo perfil</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Opie Console</source>
         <translation>Consola Opie</translation>
     </message>
     <message>
         <source>Failed</source>
         <translation>Falló</translation>
     </message>
     <message>
         <source>Connecting failed for this session.</source>
         <translation>Conexión fallida para esta sesión.</translation>
     </message>
     <message>
         <source>Session failed</source>
         <translation>Sesión fallida</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Cannot open session: Not all components were found.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;No pude abrir la sesión: No dueron encotrados todos los componentes.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Transfer mode</source>
         <translation>Modo transferencia</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Enviar</translation>
     </message>
     <message>
         <source>Receive</source>
         <translation>Recibir</translation>
     </message>
     <message>
         <source>Send file</source>
         <translation>Enviar fichero</translation>
     </message>
     <message>
         <source>Transfer protocol</source>
         <translation>Protocolo transferencia</translation>
     </message>
     <message>
         <source>Progress</source>
         <translation>Progreso</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Estado</translation>
     </message>
     <message>
         <source>Ready</source>
         <translation>Preparado</translation>
     </message>
     <message>
         <source>Start transfer</source>
         <translation>Iniciar transferencia</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
         <source>File transfer</source>
         <translation>Transferencia fichero</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation>Atención</translation>
     </message>
     <message>
         <source>No file has been specified.</source>
         <translation>Ningún fichero especificado.</translation>
     </message>
     <message>
         <source>Sending...</source>
         <translation>Enviando...</translation>
     </message>
     <message>
         <source>Receiving...</source>
         <translation>Recibiendo...</translation>
     </message>
     <message>
         <source>Cancelled</source>
         <translation>Cancelado</translation>
     </message>
     <message>
         <source>The file transfer has been cancelled.</source>
         <translation>La transferencia de ficheros ha sido cancelada.</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
         <source>Operation not supported.</source>
         <translation>Operación no adminitida.</translation>
     </message>
     <message>
         <source>Transfer could not be started.</source>
         <translation>La transferencia no pudo ser iniciada.</translation>
     </message>
     <message>
         <source>No error.</source>
         <translation>Sin error.</translation>
     </message>
     <message>
         <source>Undefined error occured.</source>
         <translation>Ocurrió un error indefinido.</translation>
     </message>
     <message>
         <source>Incomplete transfer.</source>
         <translation>Transferencia incompleta.</translation>
     </message>
     <message>
         <source>Unknown error occured.</source>
         <translation>Ocurrió un error desconocido.</translation>
     </message>
     <message>
         <source>Sent</source>
         <translation>Enviar</translation>
     </message>
     <message>
         <source>File has been sent.</source>
         <translation>Fichero enviato.</translation>
     </message>
     <message>
         <source>Received</source>
         <translation>Recibido</translation>
     </message>
     <message>
         <source>File has been received.</source>
         <translation>Fichero recibido.</translation>
     </message>
     <message>
         <source>Profile name</source>
         <translation>Nombre perfil</translation>
     </message>
     <message>
         <source>Profile</source>
         <translation>Perfil</translation>
     </message>
     <message>
         <source>Connection</source>
         <translation>Conexión</translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
         <source>Special Keys</source>
         <translation>Teclas especiales</translation>
     </message>
     <message>
         <source>Invalid profile</source>
         <translation>Perfil no válido</translation>
     </message>
     <message>
         <source>Please enter a profile name.</source>
         <translation>Por favor, introduzca un nombre de perfil.</translation>
     </message>
     <message>
         <source>Z-Modem</source>
         <translation>Z-Modem</translation>
     </message>
     <message>
         <source>Y-Modem</source>
         <translation>Y-Modem</translation>
     </message>
     <message>
         <source>X-Modem</source>
         <translation>X-Modem</translation>
     </message>
     <message>
         <source>Serial</source>
         <translation>Serie</translation>
     </message>
     <message>
         <source>Modem</source>
         <translation>Modem</translation>
     </message>
     <message>
         <source>Local Console</source>
         <translation>Consola local</translation>
     </message>
     <message>
         <source>Default Terminal</source>
         <translation>Terminal preferido</translation>
     </message>
     <message>
         <source>Default Keyboard</source>
         <translation>Teclaro preferido</translation>
     </message>
     <message>
         <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>
         <source>Reset speakers</source>
         <translation>Reinicial altavoces</translation>
     </message>
     <message>
         <source>Turning off dialtone</source>
         <translation>Apagando tono marcado</translation>
     </message>
     <message>
         <source>Dial number</source>
         <translation>Marcar número</translation>
     </message>
     <message>
         <source>Line busy, redialing number</source>
         <translation>Línea ocupada, remarcando número</translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation>Conexión establecida</translation>
     </message>
     <message>
         <source>Dismiss</source>
         <translation>Olvidar</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Dialing the number failed.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Error al marcar el número.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Fixing up Embedix</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SerialConfigWidget</name>
     <message>
         <source>Device</source>
         <translation>Dispositivo</translation>
     </message>
 </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>
         <source>Options</source>
         <translation>Opciones</translation>
     </message>
     <message>
         <source>Local echo</source>
         <translation>Eco local</translation>
     </message>
     <message>
         <source>Line wrap</source>
         <translation>Cortar líneas</translation>
     </message>
     <message>
         <source>VT 100</source>
         <translation>VT 100</translation>
     </message>
     <message>
         <source>VT 102</source>
         <translation>VT 102</translation>
     </message>
     <message>
         <source>Linux Console</source>
         <translation>Consola Linux</translation>
     </message>
     <message>
         <source>X-Terminal</source>
         <translation>Terminal X</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>green on black</source>
         <translation>verde sobre negro</translation>
     </message>
     <message>
         <source>orange on black</source>
         <translation>ambar sobre negro</translation>
     </message>
 </context>
 </TS>
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
@@ -1,300 +1,328 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BaseSetup</name>
     <message>
         <source> seconds</source>
         <translation> segundos</translation>
     </message>
     <message>
         <source>Slideshow timeout:</source>
         <translation>Tiempo por diapositiva:</translation>
     </message>
     <message>
         <source> pixel</source>
         <translation> pixel</translation>
     </message>
     <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>
         <source>Toggle autoscale</source>
         <translation>Activar Autoescalado</translation>
     </message>
     <message>
         <source>Switch to next image</source>
         <translation>Pasar a la Siguiente Imagen</translation>
     </message>
     <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>
         <source>Delete Current Item</source>
         <translation>Borrar Elemento Actual</translation>
     </message>
     <message>
         <source>View Current Item</source>
         <translation>Ver Elemento Actual</translation>
     </message>
     <message>
         <source>Show Image Info</source>
         <translation>Mostrar Información de la Imagen</translation>
     </message>
     <message>
         <source>Delete Image</source>
         <translation>Borrar Imagen</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Imagen</translation>
     </message>
     <message>
         <source>Start slideshow</source>
         <translation>Comenzar Presentación</translation>
     </message>
     <message>
         <source>the Image</source>
         <translation>la Imagen</translation>
     </message>
 </context>
 <context>
     <name>PMainWindow</name>
     <message>
         <source>Browser Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Keyboard Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie Eye - Config</source>
         <translation>Opie Eye - Configuración</translation>
     </message>
     <message>
         <source>Imageinfo Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Imageview Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Go dir up</source>
         <translation>Subir un Nivel</translation>
     </message>
     <message>
         <source>Beam file</source>
         <translation>Emitir Fichero</translation>
     </message>
     <message>
         <source>Show imageinfo</source>
         <translation>Mostrar Información</translation>
     </message>
     <message>
         <source>Delete file</source>
         <translation>Borrar Fichero</translation>
     </message>
     <message>
         <source>Display image</source>
         <translation>Mostrar Imagen</translation>
     </message>
     <message>
         <source>Start slideshow</source>
         <translation>Comenzar Presentación</translation>
     </message>
     <message>
         <source>Show toolbar</source>
         <translation>Mostrar Barra de Herramientas</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Configuración</translation>
     </message>
     <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>
         <source>Name only</source>
         <translation>Sólo Nombre</translation>
     </message>
     <message>
         <source>Next image</source>
         <translation>Imagen Siguiente</translation>
     </message>
     <message>
         <source>Previous image</source>
         <translation>Imagen Anterior</translation>
     </message>
     <message>
         <source>Show images fullscreen</source>
         <translation>Mostrar las Imágenes a Pantalla Completa</translation>
     </message>
     <message>
         <source>Auto rotate images</source>
         <translation>Autorrotar las Imágenes</translation>
     </message>
     <message>
         <source>Show images unscaled</source>
         <translation type="unfinished">Mostrar las Imágenes </translation>
     </message>
     <message>
         <source>Show zoomer window when unscaled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation>Archivo</translation>
     </message>
     <message>
         <source>Show</source>
         <translation>Mostrar</translation>
     </message>
     <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>
     <message>
         <source>Opie Eye</source>
         <translation>Opie Eye</translation>
     </message>
     <message>
         <source>DocView</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directory View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;&lt;b&gt;Be carefull with the following options!&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show files recursive</source>
         <translation>Mostrar ficheros recursivamente</translation>
     </message>
     <message>
         <source>Recursion depth:</source>
         <translation>Profundidad de la Recursión:</translation>
     </message>
     <message>
         <source> directories</source>
         <translation> directorios</translation>
     </message>
     <message>
         <source>Digital Camera View</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Name Only</source>
         <translation>Sólo Nombre</translation>
     </message>
 </context>
 <context>
     <name>imageinfo</name>
     <message>
         <source>View Full Image</source>
         <translation>Ver Imagen Completa</translation>
     </message>
     <message>
         <source>Image info</source>
         <translation>Información de Imagen</translation>
     </message>
     <message>
         <source>Displays an thumbnail of the image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays info of selected image</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,148 +1,126 @@
 <!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>
         <source>User</source>
         <translation>Usuario</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Contraseña</translation>
     </message>
     <message>
         <source>Suspend</source>
         <translation>Suspender</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Menú</translation>
     </message>
 </context>
 <context>
     <name>LoginWindowImpl</name>
     <message>
         <source>Restart</source>
         <translation>Reiniciar</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>Salir</translation>
     </message>
     <message>
-        <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
-        <translation type="obsolete">&lt;center&gt;%1 %2&lt;/center&gt;</translation>
-    </message>
-    <message>
         <source>Wrong password</source>
         <translation>Contraseña incorrecta</translation>
     </message>
     <message>
         <source>The given password is incorrect.</source>
         <translation>La contraseña es incorrecta.</translation>
     </message>
     <message>
-        <source>OPIE was terminated
-by an uncaught signal
-(%1)
-</source>
-        <translation type="obsolete">Opie ha terminado por
-una señal no capturada
-(%1)
-</translation>
-    </message>
-    <message>
         <source>Failure</source>
         <translation>Fallo</translation>
     </message>
     <message>
-        <source>Could not start OPIE.</source>
-        <translation type="obsolete">No pude iniciar Opie.</translation>
-    </message>
-    <message>
         <source>Could not switch to new user identity</source>
         <translation>No pude pasar a la nueva identidad de usuario</translation>
     </message>
     <message>
         <source>Opie was terminated
 by an uncaught signal
 (%1)
 </source>
         <translation>Opie fue terminado por
 una señal no capturada
 (%1)
 </translation>
     </message>
     <message>
         <source>Could not start Opie.</source>
         <translation>No pude iniciar Opie.</translation>
     </message>
 </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>
     <message>
         <source>&lt;b&gt;Password:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Confirm:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PasswordDialogImpl</name>
     <message>
         <source>Trying to leave without password set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;No password was set. This could lead to you not beeingable to remotely connect to your machine.Do you want to continue not setting a password?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passwords don&apos;t match</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The two passwords don&apos;t match. Please try again.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password not legal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The entered password is not a valid password.Please try entering a valid password.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,793 +1,721 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DCCProgress</name>
     <message>
         <source>Receiving file %1 from %2...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully received %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Peer Aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Timeout</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DCCTransferTab</name>
     <message>
         <source>DCC Transfers in Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are transfers in progress. &lt;br&gt;If you close this tab, they will be canceled.&lt;br&gt;Do you want to close it anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DCC Transfer from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is trying to send you the file %2
 (%3 bytes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Reject</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCChannelTab</name>
     <message>
         <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>
         <source>Whois</source>
         <translation>Quien es</translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation>Desconectado</translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
         <translation>Conectado, registrándome ..</translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
         <translation>Registrado con éxito.</translation>
     </message>
     <message>
         <source>Socket error : </source>
         <translation>Error de conexión: </translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation>Conexión cerrada</translation>
     </message>
 </context>
 <context>
     <name>IRCHistoryLineEdit</name>
     <message>
         <source>Next Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Mode change has unknown type</source>
         <translation>Cambio de modo de tipo desconocido</translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
         <translation>Cambio de modo con persona desconocida - ¿desincronizado?</translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
         <translation>Cambio de modo con indicador desconocido</translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
         <translation>Cambio de modo con kanal desconocido - ¿desincronizado?</translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
         <translation>Modos de usuario no implentados todavía</translation>
     </message>
     <message>
         <source>You were kicked from </source>
         <translation>Ha sido expulsado de </translation>
     </message>
     <message>
         <source> by </source>
         <translation>por </translation>
     </message>
     <message>
         <source> was kicked from </source>
         <translation>fue expulsado de </translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
         <translation>Expulsión de persona desconocida - ¿desincronizado?</translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
         <translation>Expulsión de canal desconocido - ¿desincronizado?</translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
         <translation>Mensaje del servidor con canal desconocido</translation>
     </message>
     <message>
         <source>You joined channel </source>
         <translation>Unido al canal</translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
         <translation>Apodo en uso, por favor, reconectese con uno diferente</translation>
     </message>
     <message>
         <source>No such nickname</source>
         <translation>No hay tal apodo</translation>
     </message>
     <message>
         <source>Received unhandled numeric command: %1</source>
         <translation>Recibido comando numérico no manejado: %1</translation>
     </message>
     <message>
         <source>Received unhandled ctcp command: %1</source>
         <translation>Recibido comando ctcp no manejado: %1</translation>
     </message>
     <message>
         <source>Received unhandled literal command: %1</source>
         <translation>Recibido comando literal no manejado: %1</translation>
     </message>
     <message>
         <source>%1 joined channel %2</source>
         <translation>%1 unido al canal %2</translation>
     </message>
     <message>
         <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>
         <source>There are %1 unknown connection(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are %1 channels formed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait a while and try again</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Whois %1 (%2@%3)
 Real name: %4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is using server %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is on channels: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Names for %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time on server %1 is %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel or nick %1 doesn&apos;t exists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is no history information for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t change nick to %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You&apos;re not on channel %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>[%1] Operation not permitted, you don&apos;t have enough channel privileges</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connected to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 has been idle for %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 signed on %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP PING with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP PING with unknown channel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP PING with bad recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP VERSION request from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING reply from %1: %2 seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malformed DCC request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
         <translation>Hablando con </translation>
     </message>
     <message>
         <source>Private discussion</source>
         <translation>Discusión privada</translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
         <translation>Escriba aquí su texto para enviar un mensaje a la otra persona</translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation>Desconectado</translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
         <translation>Nombre del perfil :</translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
         <translation>El nombre de este perfil del servidor en el vistazo</translation>
     </message>
     <message>
         <source>Hostname :</source>
         <translation>Máquina :</translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
         <translation>El servidor al que conectarse - puede ser un nombre de máquina válido o dirección IP</translation>
     </message>
     <message>
         <source>Port :</source>
         <translation>Puerto :</translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
         <translation>El puerto del servidor al que conectarse. Usualmente 6667</translation>
     </message>
     <message>
         <source>Nickname :</source>
         <translation>Apodo :</translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
         <translation>Su apodo en la red IRC</translation>
     </message>
     <message>
         <source>Realname :</source>
         <translation>Nombre real :</translation>
     </message>
     <message>
         <source>Your real name</source>
         <translation>Su nombre real</translation>
     </message>
     <message>
         <source>Password :</source>
         <translation>Clave :</translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
         <translation>Clave para conectarte al servidor (si es requerida)</translation>
     </message>
     <message>
         <source>Channels :</source>
         <translation>Canales :</translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
         <translation>Lista de todos los canales, seperados por comas, a los que le gustaría unirse automáticamente</translation>
     </message>
     <message>
         <source>Edit server information</source>
         <translation>Editar información del servidor</translation>
     </message>
     <message>
         <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>
         <translation>Navegador lista servidores</translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
         <translation>Por favor, elija un perfil de servidor</translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
         <translation>Seleccione un perfil de servidor de esta lista y entonces pulse Ok en la esquina uperior derecha</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Añadir</translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
         <translation>Borrar el perfil de servidor actualmente seleccionado</translation>
     </message>
     <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>
 <context>
     <name>IRCSession</name>
     <message>
         <source>You are now known as %1</source>
         <translation type="unfinished">Ahora es conocido como %1</translation>
     </message>
     <message>
         <source>Nickname change of an unknown person</source>
         <translation type="unfinished">Cambio de apodo de una persona desconocida</translation>
     </message>
     <message>
         <source>%1 is now known as %2</source>
         <translation type="unfinished">%1 es ahora conocido como %2</translation>
     </message>
 </context>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Lines displayed :</source>
         <translation>Líneas mostradas :</translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
         <translation>Cantidad de líneas mostradas en los chats antes de que sean borradas la viejas - es necesario para restringir el consumo de memoria. Fíjelo en 0 si no neceista esto</translation>
     </message>
     <message>
         <source>General</source>
         <translation>General</translation>
     </message>
     <message>
         <source>Background color :</source>
         <translation>Color de fondo :</translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
         <translation>Color del fondo que se usará en los chats</translation>
     </message>
     <message>
         <source>Normal text color :</source>
         <translation>Color del texto normal :</translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
         <translation>Color del texto que se usará en los chats</translation>
     </message>
     <message>
         <source>Error color :</source>
         <translation>Color de error :</translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
         <translation>Color del texto que se usará al mostrar errores</translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
         <translation>Texto propio :</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
         <translation>Color del texto que se usará para identificar el texto escrito por si mismo</translation>
     </message>
     <message>
         <source>Text written by others :</source>
         <translation>Texto ajeno :</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
         <translation>Color del texto que se usará para identificar el texto escrito por otros</translation>
     </message>
     <message>
         <source>Text written by the server :</source>
         <translation>Texto escrito por el servidor :</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
         <translation>Color del texto que se usará para identificar el texto escrito por el servidor</translation>
     </message>
     <message>
         <source>Notifications :</source>
         <translation>Notificaciones :</translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
         <translation>Color del texto que se usará al mostrar notificaciones</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Colores</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Configuración</translation>
     </message>
     <message>
         <source>Display time in chat log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Keyboard Shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCTab</name>
     <message>
         <source>Missing description</source>
         <translation>Descripción perdida</translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
         <translation>Descripción del contenido de la pestaña</translation>
     </message>
     <message>
         <source>Close this tab</source>
         <translation>Cerrar esta pestaña</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
         <translation>Ciente IRC</translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
         <translation>Conexiones al sevidor, canales, peticiones y otras cosas serán colocadas aquí</translation>
     </message>
     <message>
         <source>IRC</source>
         <translation>IRC</translation>
     </message>
     <message>
         <source>New connection</source>
         <translation>Nueva conexión</translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
         <translation>Crear una nueva conexión a un servidor IRC</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Configuración</translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
         <translation>Configurar OpieIRC</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source> User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie IRC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> gives channel operator status to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> removes channel operator status from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> gives voice to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> removes voice from </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,817 +1,878 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AccountView</name>
     <message>
         <source>Error creating new Folder</source>
         <translation>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>&lt;center&gt;Error al crear&lt;br&gt;un nuevo directorio - saliendo.&lt;/center&gt;</translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation>No hay entradas en la libreta de direcciones.</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Debe seleccionar al menos una entrada de la libreta de direcciones.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
 </context>
 <context>
     <name>AddressPickerUI</name>
     <message>
         <source>Address Picker</source>
         <translation>Selector de direcciones</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
 </context>
 <context>
     <name>ComposeMail</name>
     <message>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamaño</translation>
     </message>
     <message>
         <source>Problem</source>
         <translation>Problema</translation>
     </message>
     <message>
         <source>&lt;p&gt;Please create an SMTP account first.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Por favor cree una cuenta SMTP antes.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a File.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Por favor seleccione un Fichero.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Sending mail</source>
         <translation>Enviando correo</translation>
     </message>
     <message>
         <source>Store message</source>
         <translation>Guardar mensajes</translation>
     </message>
     <message>
         <source>Store message into drafts?</source>
         <translation>¿Guardar mensajes en la carpeta de borradores?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sí</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>&lt;center&gt;Attachments will not be stored in &quot;Draft&quot; folder&lt;/center&gt;</source>
         <translation>&lt;center&gt;Los Adjuntos no serán almacenados en el directorio &quot;Borradores&quot;&lt;/center&gt;</translation>
     </message>
     <message>
         <source>No Receiver specified</source>
         <translation>No se ha especificado el Destinatario</translation>
     </message>
 </context>
 <context>
     <name>ComposeMailUI</name>
     <message>
         <source>Compose Message</source>
         <translation>Escribir Mensaje</translation>
     </message>
     <message>
         <source>send later</source>
         <translation>enviar despúes</translation>
     </message>
     <message>
         <source>use:</source>
         <translation>Usar:</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Correo</translation>
     </message>
     <message>
         <source>Subject</source>
         <translation>Asunto</translation>
     </message>
     <message>
         <source>From</source>
         <translation>De</translation>
     </message>
     <message>
         <source>To</source>
         <translation>Para</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opciones</translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation>Responder-A</translation>
     </message>
     <message>
         <source>BCC</source>
         <translation>BCC</translation>
     </message>
     <message>
         <source>Signature</source>
         <translation>Firma</translation>
     </message>
     <message>
         <source>CC</source>
         <translation>CC</translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation>Adjunto</translation>
     </message>
     <message>
         <source>Delete File</source>
         <translation>Borrar Fichero</translation>
     </message>
     <message>
         <source>Add File</source>
         <translation>Añadir Fichero</translation>
     </message>
 </context>
 <context>
     <name>EditAccounts</name>
     <message>
         <source>Account</source>
         <translation>Cuenta</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
         <source>Question</source>
         <translation>Pregunta</translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete the selected Account?&lt;/p&gt;</source>
         <translation>&lt;p&gt;¿Está seguro de que quiere borrar la cuenta seleccionada?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sí</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select an account.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Por favor seleccione una cuenta.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
 </context>
 <context>
     <name>EditAccountsUI</name>
     <message>
         <source>Configure Accounts</source>
         <translation>Configurar Cuentas</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Correo</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nueva</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Nombre de la Cuenta</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>News</source>
         <translation>Noticias</translation>
     </message>
 </context>
 <context>
     <name>IMAPconfigUI</name>
     <message>
         <source>Configure IMAP</source>
         <translation>Configurar IMAP</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Usuario</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Contraseña</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Puerto</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Servidor</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Nombre de la Cuenta</translation>
     </message>
     <message>
         <source>Account</source>
         <translation>Cuenta</translation>
     </message>
     <message>
         <source>Prefix</source>
         <translation>Prefijo</translation>
     </message>
     <message>
         <source>ssh $SERVER exec</source>
         <translation>ssh $SERVER exec</translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation>Usar SSL:</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Mail</source>
         <translation>Correo</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Configuración</translation>
     </message>
     <message>
         <source>Compose new mail</source>
         <translation>Escribir mensaje nuevo</translation>
     </message>
     <message>
         <source>Send queued mails</source>
         <translation>Enviar mensajes encolados</translation>
     </message>
     <message>
         <source>Show/Hide folders</source>
         <translation>Mostrar/Ocultar directorios</translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation>Borrar Correo</translation>
     </message>
     <message>
         <source>Edit settings</source>
         <translation>Editar Configuración</translation>
     </message>
     <message>
         <source>Configure accounts</source>
         <translation>Configurar Cuentas</translation>
     </message>
     <message>
         <source>Mailbox</source>
         <translation></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation>Asunto</translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Newsgroups</source>
         <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>
 <context>
     <name>NNTPconfigUI</name>
     <message>
         <source>Configure NNTP</source>
         <translation>Configurar NNTP</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Puerto</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Nombre de la Cuenta</translation>
     </message>
     <message>
         <source>Account</source>
         <translation>Cuenta</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Servidor</translation>
     </message>
     <message>
         <source>Use SSL</source>
         <translation>Usar SSL</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Usuario</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Contraseña</translation>
     </message>
     <message>
         <source>Use Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Grupos</translation>
     </message>
     <message>
         <source>Newsgroup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get newsgroup list from server</source>
         <translation>Obtener lista de grupos desde el servidor</translation>
     </message>
 </context>
 <context>
     <name>Newmdirdlgui</name>
     <message>
         <source>Enter directory name</source>
         <translation>Introduzca el nombre del directorio</translation>
     </message>
     <message>
         <source>Directory name:</source>
         <translation>Nombre del Directorio:</translation>
     </message>
     <message>
         <source>Directory contains other subdirs</source>
         <translation>El Directorio contiene otros Subdirectorios</translation>
     </message>
 </context>
 <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>
     <message>
         <source>IMAP</source>
         <translation>IMAP</translation>
     </message>
     <message>
         <source>POP3</source>
         <translation>POP3</translation>
     </message>
     <message>
         <source>SMTP</source>
         <translation>SMTP</translation>
     </message>
 </context>
 <context>
     <name>SettingsDialogUI</name>
     <message>
         <source>Settings Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View mail as Html</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compose Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mails later ( enqueue in outbox )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Store mail(s) to&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Folder:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create new folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefix will prepend, no need to enter it!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move mail(s)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,228 +1,154 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HelpWindow</name>
     <message>
         <source>Backward</source>
         <translation>Atrás</translation>
     </message>
     <message>
         <source>Forward</source>
         <translation>Adelante</translation>
     </message>
 </context>
 <context>
     <name>QtRec</name>
     <message>
         <source>OpieRecord </source>
         <translation>Grabadora Opie</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
         <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>
         <source>Volume</source>
         <translation>Volumen</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <source>Send with Ir</source>
         <translation>Enviar por IR</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Renombrar</translation>
     </message>
     <message>
         <source>Ir Beam out</source>
         <translation>Emitir por IR</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>Enviado por IR.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
-        <source>Rec</source>
-        <translation 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>
         <source>Please select file to play</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,171 +1,131 @@
 <!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>
         <source>Options</source>
         <translation>Opciones</translation>
     </message>
     <message>
         <source>Enter your search terms here</source>
         <translation>Introduzca aquí sus términos de búsqueda</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Aplicaciones</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Documentos</translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation>Tareas</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Calendario</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Contactos</translation>
     </message>
     <message>
         <source>Search for: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case sensitive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OListView</name>
     <message>
         <source>Results</source>
         <translation>Resultados</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>show</source>
         <translation>mostrar</translation>
     </message>
     <message>
         <source>edit</source>
         <translation>editar</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>ejecutar</translation>
     </message>
     <message>
         <source>open in filemanager</source>
         <translation>abrir en el Gestor de Ficheros</translation>
     </message>
     <message>
         <source>open with </source>
         <translation>abrir con</translation>
     </message>
     <message>
-        <source>show completed tasks</source>
-        <translation 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>
         <source>Search in dates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search content</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,451 +1,439 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CalcDlg</name>
     <message>
         <source>Calculate</source>
         <translation>Calcular</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Molecular Weight</source>
         <translation>Peso molecular</translation>
     </message>
     <message>
         <source>Chemical Formula</source>
         <translation>Fórmula química</translation>
     </message>
     <message>
         <source>Molecular Weight (u):</source>
         <translation>Peso molecular (u):</translation>
     </message>
     <message>
         <source>Elemental Composition (%):</source>
         <translation>Composición elemental (%):</translation>
     </message>
     <message>
         <source>CalcDlg</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OxydataWidget</name>
     <message>
         <source>Block</source>
         <translation>Bloque</translation>
     </message>
     <message>
         <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>
         <source>%1 pm</source>
         <translation>%1 pm</translation>
     </message>
     <message>
         <source>%1 g/cm^3</source>
         <translation>%1 g/cm^3</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation>Peso</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>
 <context>
     <name>Oxygen</name>
     <message>
         <source>Oxygen</source>
         <translation>Oxygen</translation>
     </message>
     <message>
         <source>PSE</source>
         <translation>PSE</translation>
     </message>
     <message>
         <source>Data</source>
         <translation>Datos</translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation>Cálculos</translation>
     </message>
     <message>
         <source>Hydrogen</source>
         <translation>Hidrógeno</translation>
     </message>
     <message>
         <source>Helium</source>
         <translation>Helio</translation>
     </message>
     <message>
         <source>Lithium</source>
         <translation>Litio</translation>
     </message>
     <message>
         <source>Beryllium</source>
         <translation>Berilio</translation>
     </message>
     <message>
         <source>Boron</source>
         <translation>Boro</translation>
     </message>
     <message>
         <source>Carbon</source>
         <translation>Carbono</translation>
     </message>
     <message>
         <source>Nitrogen</source>
         <translation>Nitrógeno</translation>
     </message>
     <message>
         <source>Fluorine</source>
         <translation>Fluor</translation>
     </message>
     <message>
         <source>Neon</source>
         <translation>Neón</translation>
     </message>
     <message>
         <source>Sodium</source>
         <translation>Sodio</translation>
     </message>
     <message>
         <source>Magnesium</source>
         <translation>Magnesio</translation>
     </message>
     <message>
         <source>Aluminum</source>
         <translation>Aluminio</translation>
     </message>
     <message>
         <source>Silicon</source>
         <translation>Silicio</translation>
     </message>
     <message>
         <source>Phosphorus</source>
         <translation>Fósforo</translation>
     </message>
     <message>
         <source>Sulfur</source>
         <translation>Azufre</translation>
     </message>
     <message>
         <source>Chlorine</source>
         <translation>Cloro</translation>
     </message>
     <message>
         <source>Argon</source>
         <translation>Argón</translation>
     </message>
     <message>
         <source>Potassium</source>
         <translation>Potasio</translation>
     </message>
     <message>
         <source>Calcium</source>
         <translation>Calcio</translation>
     </message>
     <message>
         <source>Scandium</source>
         <translation>Escandio</translation>
     </message>
     <message>
         <source>Titanium</source>
         <translation>Titánio</translation>
     </message>
     <message>
         <source>Vanadium</source>
         <translation>Vanadio</translation>
     </message>
     <message>
         <source>Chromium</source>
         <translation>Cromo</translation>
     </message>
     <message>
         <source>Manganese</source>
         <translation>Manganeso</translation>
     </message>
     <message>
         <source>Iron</source>
         <translation>Hierro</translation>
     </message>
     <message>
         <source>Cobalt</source>
         <translation>Cobalto</translation>
     </message>
     <message>
         <source>Nickel</source>
         <translation>Niquel</translation>
     </message>
     <message>
         <source>Copper</source>
         <translation>Cobre</translation>
     </message>
     <message>
         <source>Zinc</source>
         <translation>Zinc</translation>
     </message>
     <message>
         <source>Gallium</source>
         <translation>Galio</translation>
     </message>
     <message>
         <source>Germanium</source>
         <translation>Germanio</translation>
     </message>
     <message>
         <source>Arsenic</source>
         <translation>Arsénico</translation>
     </message>
     <message>
         <source>Selenium</source>
         <translation>Selenio</translation>
     </message>
     <message>
         <source>Bromine</source>
         <translation>Bromo</translation>
     </message>
     <message>
         <source>Krypton</source>
         <translation>Kriptón</translation>
     </message>
     <message>
         <source>Rubidium</source>
         <translation>Rubidio</translation>
     </message>
     <message>
         <source>Strontium</source>
         <translation>Estroncio</translation>
     </message>
     <message>
         <source>Yttrium</source>
         <translation>Ytrio</translation>
     </message>
     <message>
         <source>Zirconium</source>
         <translation>Zirconio</translation>
     </message>
     <message>
         <source>Niobium</source>
         <translation>Niobio</translation>
     </message>
     <message>
         <source>Molybdenum</source>
         <translation>Molibdeno</translation>
     </message>
     <message>
         <source>Technetium</source>
         <translation>Tecnecio</translation>
     </message>
     <message>
         <source>Ruthenium</source>
         <translation>Rutenio</translation>
     </message>
     <message>
         <source>Rhodium</source>
         <translation>Rodio</translation>
     </message>
     <message>
         <source>Palladium</source>
         <translation>Paladio</translation>
     </message>
     <message>
         <source>Silver</source>
         <translation>Plata</translation>
     </message>
     <message>
         <source>Cadmium</source>
         <translation>Cadmio</translation>
     </message>
     <message>
         <source>Indium</source>
         <translation>Indio</translation>
     </message>
     <message>
         <source>Tin</source>
         <translation>Estaño</translation>
     </message>
     <message>
         <source>Antimony</source>
         <translation>Antimonio</translation>
     </message>
     <message>
         <source>Tellurium</source>
         <translation>Teluro</translation>
     </message>
     <message>
         <source>Iodine</source>
         <translation>Yodo</translation>
     </message>
     <message>
         <source>Xenon</source>
         <translation>Xenón</translation>
     </message>
     <message>
         <source>Cesium</source>
         <translation>Césio</translation>
     </message>
     <message>
         <source>Barium</source>
         <translation>Bario</translation>
     </message>
     <message>
         <source>Lanthanum</source>
         <translation>Lantano</translation>
     </message>
     <message>
         <source>Cerium</source>
         <translation>Cerio</translation>
     </message>
     <message>
         <source>Praseodymium</source>
         <translation>Praseodimio</translation>
     </message>
     <message>
         <source>Neodymium</source>
         <translation>Neodimio</translation>
     </message>
     <message>
         <source>Promethium</source>
         <translation>Prometio</translation>
     </message>
     <message>
         <source>Samarium</source>
         <translation>Samario</translation>
     </message>
     <message>
         <source>Europium</source>
         <translation>Europio</translation>
     </message>
     <message>
         <source>Gadolinium</source>
         <translation>Gadolinio</translation>
     </message>
     <message>
         <source>Terbium</source>
         <translation>Terbio</translation>
     </message>
     <message>
         <source>Dysprosium</source>
         <translation>Disprosio</translation>
     </message>
     <message>
         <source>Holmium</source>
         <translation>Holmio</translation>
     </message>
     <message>
         <source>Erbium</source>
         <translation>Erbio</translation>
     </message>
     <message>
         <source>Thulium</source>
         <translation>Tulio</translation>
     </message>
     <message>
         <source>Ytterbium</source>
         <translation>Yterbio</translation>
     </message>
     <message>
         <source>Lutetium</source>
         <translation>Lutecio</translation>
     </message>
     <message>
         <source>Hafnium</source>
         <translation>Hafnio</translation>
     </message>
     <message>
         <source>Tantalum</source>
         <translation>Tántalo</translation>
     </message>
     <message>
         <source>Tungsten</source>
         <translation>Wolframio</translation>
     </message>
     <message>
         <source>Rhenium</source>
         <translation>Renio</translation>
     </message>
     <message>
         <source>Osmium</source>
         <translation>Osmio</translation>
     </message>
     <message>
         <source>Iridium</source>
         <translation>Iridio</translation>
     </message>
     <message>
         <source>Platinum</source>
         <translation>Platino</translation>
     </message>
     <message>
         <source>Gold</source>
         <translation>Oro</translation>
     </message>
     <message>
         <source>Mercury</source>
         <translation>Mercurio</translation>
     </message>
     <message>
         <source>Thallium</source>
         <translation>Talio</translation>
     </message>
     <message>
         <source>Lead</source>
         <translation>Plomo</translation>
     </message>
     <message>
         <source>Bismuth</source>
         <translation>Bismuto</translation>
     </message>
     <message>
         <source>Polonium</source>
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
@@ -1,97 +1,73 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CanvasCardWindow</name>
     <message>
         <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>
         <source>&amp;Change card backs</source>
         <translation>&amp;Volver a cambiar la carta</translation>
     </message>
     <message>
         <source>&amp;Snap to position</source>
         <translation>&amp;Saltar a la posición</translation>
     </message>
     <message>
         <source>Change card backs</source>
         <translation>Volver a cambiar la carta</translation>
     </message>
     <message>
         <source>Snap to position</source>
         <translation>Saltar a la posición</translation>
     </message>
     <message>
         <source>Turn one card</source>
         <translation>Volver una carta</translation>
     </message>
     <message>
         <source>Turn three cards</source>
         <translation>Volver tres carta</translation>
     </message>
 </context>
 </TS>
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
@@ -1,594 +1,415 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished">Problema en la aplicación</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;%1 no responde.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;¿Quiere forzar la salida de la aplicación?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <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>
 <context>
     <name>FirstUse</name>
     <message>
         <source>&lt;&lt; Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next &gt;&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap anywhere on the screen to continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait, loading %1 settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finish</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputMethods</name>
     <message>
         <source>Unicode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation type="unfinished">Lanzador</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished"> - Lanzador</translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished">Sin aplicación</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished">&lt;p&gt;No se ha definido una aplicación para este documento.&lt;p&gt; Tipo %1%.</translation>
     </message>
     <message>
-        <source>Finding documents</source>
-        <translation type="obsolete">Buscando documentos</translation>
-    </message>
-    <message>
-        <source>Searching documents</source>
-        <translation type="obsolete">Buscando documentos</translation>
-    </message>
-    <message>
         <source>Documents</source>
         <translation type="unfinished">Documentos</translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>Icon View</source>
         <translation type="unfinished">Ver como iconos</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished">Ver como lista</translation>
     </message>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
-        <source>%1 files</source>
-        <translation type="obsolete">%1 ficheros</translation>
-    </message>
-    <message>
-        <source>All types of file</source>
-        <translation type="obsolete">Todos los tipos de ficheros</translation>
-    </message>
-    <message>
         <source>Document View</source>
         <translation type="unfinished">Ver como documentos</translation>
     </message>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>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>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished">Todos</translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished">Imagen</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished">Texto</translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished">Vídeo</translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished">Añadir</translation>
     </message>
     <message>
         <source>Remove</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">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>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Server</name>
     <message>
         <source>USB Lock</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation type="unfinished">Información</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;La fecha del sistema parece no ser válida.
 (%1)&lt;/p&gt;&lt;p&gt;¿Quiere poner en hora el reloj?&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>Battery level is critical!
-Keep power off until power restored!</source>
-        <translation type="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>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Critical Memory Shortage
 Please end this application
 immediately.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WARNING</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The battery is running very low. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The Back-up battery is very low&lt;p&gt;Please charge the back-up battery</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation type="unfinished">Terminar</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation type="unfinished">Terminar Opie</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation type="unfinished">Reiniciar</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation type="unfinished">Reiniciar Opie</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation type="unfinished">Apagar</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished">Cancelar</translation>
     </message>
     <message>
-        <source>&lt;p&gt;
-These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
-        <translation type="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
@@ -1,408 +1,244 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoginBase</name>
     <message>
         <source>LoginBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login</source>
         <translation type="unfinished">Identificación</translation>
     </message>
     <message>
         <source>Login Automatically</source>
         <translation type="unfinished">Identificación automática</translation>
     </message>
     <message>
         <source>If you select this option, opie-login will automagically log you in with the user you have selected in the drop-down list.  
 
 For the Zaurus 5x00 this is always the user &quot;root&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This drop-down list allows you to select the user for auto-login
 (if enabled above).  
 
 You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MultiauthConfig</name>
     <message>
         <source>Security configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the order they will appear in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login</source>
         <translation type="unfinished">Identificación</translation>
     </message>
     <message>
         <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>
         <source>Locking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></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-securityplugin-*&lt;/em&gt; package! Once you have done that, you will be able to configure your PDA protection here.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MultiauthGeneralConfig</name>
     <message>
         <source>When to lock Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on Opie start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on Opie resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Multiple plugins authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Required successes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Don&apos;t protect this config screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show explanatory screens</source>
         <translation type="unfinished"></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>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You must save your current settings before trying to authenticate. Press OK to accept and launch a simulated authentication process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you don&apos;t like the result of this test, don&apos;t forget to change your settings before you exit the configuration application!</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>
     </message>
     <message>
         <source>Select a net-range or enter a new one.  
 
 This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
 
 For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
 
 The entry &quot;All&quot; will allow *any* IP to connect. 
 The entry &quot;None&quot; will *deny* any connection.  
 
 If unsure, select &quot;Any&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the selected net range from the list
 
 If you press this button, the currently selected net range will be deleted from the list of net ranges.
 
 If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
 the list to the state it has been when you initially booted your Zaurus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button will restore the list of net ranges
 to the defaults.
 
 Beware that all manually entered net ranges will be lost!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select your sync software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Qtopia 1.7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie 1.0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IntelliSync</source>
         <translation type="unfinished"></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="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,51 +1,43 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>SnakeGame</name>
     <message>
         <source>Snake</source>
         <translation>Serpiente</translation>
     </message>
     <message>
         <source>New Game</source>
         <translation>Nuevo juego</translation>
     </message>
     <message>
         <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
@@ -1,413 +1,365 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation>Este área muestra las pruebas disponibles, los resultados para las que se han realizado, y la comparación con los valores para un dispositivo seleccionado. Use las casillas para seleccionar las pruebas que desea realizar.</translation>
     </message>
     <message>
         <source>Tests</source>
         <translation>Pruebas</translation>
     </message>
     <message>
         <source>Results</source>
         <translation>Resultados</translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation>Comparación</translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation>1. Aritmética de Enteros  </translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation>2. Unidad de Punto Flotante</translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation>3. Renderizado de Texto</translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation>4. Renderizado Gfx  </translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation>5. Rendimiento de la RAM</translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation>6. Rendimiento de la Tarjeta SD</translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation>7. Rendimiento de la Tarjeta CF  </translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation>¡&amp;Comenzar las Pruebas!</translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation>Pulse aquí para realizar las pruebas seleccionadas.</translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation>Escoja un modelo con el que comparar sus resultados.</translation>
     </message>
     <message>
         <source>error</source>
         <translation>error</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>Este gráfico representa la memoria usada actualmente es esta tarjeta de memoria Compact Flash.</translation>
     </message>
     <message>
         <source>Ha</source>
         <translation>Ha</translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation>Este gráfico representa el almacenamiento usado en este disco duro.</translation>
     </message>
     <message>
         <source>SD</source>
         <translation>SD</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation>Este gráfico representa cuanta memoria se usa actualmente en esta tarjeta Secure Digital.</translation>
     </message>
     <message>
         <source>SC</source>
         <translation>SC</translation>
     </message>
     <message>
         <source>In</source>
         <translation>En</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>Este gráfico representa cuanta memoria se usa actualmente de la memoria incorporada (p.e. Flash) en este dispositivo.</translation>
     </message>
     <message>
         <source>RA</source>
         <translation>RA</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation>Este gráfico representa cuánta memoria usa actualmente el disco RAM temporal.</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Uso de CPU por la aplicación (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>Uso de CPU por el sistema (%)</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Tipo: </translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Esta página muestra el procesador que está siendo usado.</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Usado (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Buffers (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>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.
 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>Total Swap: %1 kB</source>
         <translation>Memoria Swap Total: %1 kB</translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Módulo</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamaño</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Uso#</translation>
     </message>
     <message>
-        <source>Used By</source>
-        <translation type="obsolete">Usado por</translation>
-    </message>
-    <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>Esta es una lista de todos los módulos del kernel actualmente cargados.
 
 Mantenga pulsado un módulo para ver información adicional sobre el módulo, o descargarlo.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Seleccione un comando aquí y luego pulse el botón Enviar de la derecha para que lo reciba el módulo seleccionado arriba.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Enviar</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Pulse aquí para enviar el comando selecciondo al módulo seleccionado arriba.</translation>
     </message>
     <message>
-        <source>You really want to execute
-</source>
-        <translation type="obsolete">Seguro que quiere ejecutar
-</translation>
-    </message>
-    <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Esta área muestra información detallada sobre este módulo.</translation>
     </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>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Usado (%1 kB)</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>Libre (%1 kB)</translation>
     </message>
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Comando</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Estado</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Tiempo</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation>Esta es una lista de todos los procesos de este dispositivo.
 
 Mantenga pulsado un proceso para ver información adicional, o para enviarle una señal.</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation>Seleccione aquí una señal y luego pulse el botón Enviar de la derecha para enviárselo a este proceso.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Enviar</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation>Pulse aquí para enviar la señal seleccionada a este proceso.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>Esta área muestra información detallada sobre este proceso.</translation>
     </message>
     <message>
-        <source>You really want to send
-</source>
-        <translation type="obsolete">Seguro que quiere enviar
-</translation>
-    </message>
-    <message>
-        <source>You really want to send %1 to this process?</source>
-        <translation 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>
     <message>
         <source>Memory</source>
         <translation>Memoria</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Almacenamiento</translation>
     </message>
     <message>
         <source>CPU</source>
         <translation>CPU</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Procesos</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Versión</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>Módulos</translation>
     </message>
     <message>
         <source>Benchmark</source>
         <translation>Pruebas</translation>
     </message>
     <message>
         <source>Syslog</source>
         <translation>Registros</translation>
     </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Kernel Linux&lt;/b&gt;&lt;p&gt;Versión: </translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Compilado por: </translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Versión: </translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Fecha compilación: </translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>&lt;p&gt;Versión: </translation>
     </message>
     <message>
-        <source>&lt;p&gt;Model: </source>
-        <translation 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>
         <source>Built against Qt/E </source>
         <translation>Compilado contra Qt/E </translation>
     </message>
 </context>
 </TS>
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,69 +1,58 @@
 <!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>
     <message>
         <source>TableViewer - Edit Keys</source>
         <translation>Visor Base Datos - Editar claves</translation>
     </message>
     <message>
         <source>Key Name</source>
         <translation>Nombre clave</translation>
     </message>
     <message>
         <source>Key Type</source>
         <translation>Tipo clave</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuevo</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Eliminar</translation>
     </message>
     <message>
         <source>Clear All</source>
         <translation>Borrar todo</translation>
     </message>
 </context>
 <context>
     <name>TVListView</name>
     <message>
         <source>List View</source>
         <translation>Ver lista</translation>
     </message>
 </context>
 <context>
     <name>TableViewerWindow</name>
     <message>
         <source>Table Viewer</source>
         <translation>Visor de tabla</translation>
     </message>
     <message>
         <source>could not load Document</source>
         <translation>no puedo cargar documento</translation>
     </message>
 </context>
 </TS>
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
@@ -1,281 +1,275 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>TextEdit</name>
     <message>
         <source>New</source>
         <translation>Nuevo</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Guardar</translation>
     </message>
     <message>
         <source>Save As</source>
         <translation>Guardar como</translation>
     </message>
     <message>
         <source>Cut</source>
         <translation>Cortar</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Pegar</translation>
     </message>
     <message>
         <source>Find...</source>
         <translation>Buscar...</translation>
     </message>
     <message>
         <source>Zoom in</source>
         <translation>Acercar</translation>
     </message>
     <message>
         <source>Zoom out</source>
         <translation>Alejar</translation>
     </message>
     <message>
         <source>Wrap lines</source>
         <translation>Cortar líneas</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Letra</translation>
     </message>
     <message>
         <source>Start with new file</source>
         <translation>Empezar con Nuevo</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Fichero</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation>Buscar siguiente</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Cerrar Buscar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation>Editor de Textos</translation>
     </message>
     <message>
         <source>.desktop File</source>
         <translation>Fichero .desktop</translation>
     </message>
     <message>
         <source>Linked Document</source>
         <translation>Documento enlazado</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todo</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Texto</translation>
     </message>
     <message>
         <source>Insert Time and Date</source>
         <translation>Insertar hora y fecha</translation>
     </message>
     <message>
         <source>Advanced Features</source>
         <translation>Opciones avanzadas</translation>
     </message>
     <message>
         <source>Prompt on Exit</source>
         <translation>Preguntar al salir</translation>
     </message>
     <message>
         <source>Always open linked file</source>
         <translation>Abrir siempre fichero enlazado</translation>
     </message>
     <message>
         <source>File Permissions</source>
         <translation>Permisos fichero</translation>
     </message>
     <message>
         <source>Search Bar Open</source>
         <translation>Barra de búsqueda abierta</translation>
     </message>
     <message>
         <source>Goto Line...</source>
         <translation>Ir a línea...</translation>
     </message>
     <message>
         <source>Auto Save 5 min.</source>
         <translation>Autograbar 5 min.</translation>
     </message>
     <message>
         <source>Text Editor has detected&lt;BR&gt;you selected a &lt;B&gt;.desktop&lt;/B&gt;file.&lt;BR&gt;Open&lt;B&gt;.desktop&lt;/B&gt; file or &lt;B&gt;linked&lt;/B&gt; file?</source>
         <translation>Editor de Textos ha detectado que &lt;BR&gt;seleccionó un fichero &lt;B&gt;.desktop&lt;/B&gt;. ¿Abro el fichero &lt;B&gt;.desktop&lt;/B&gt; o su &lt;B&gt;enlace&lt;/B&gt;?</translation>
     </message>
     <message>
         <source>Text Edit</source>
         <translation>Editor de Textos</translation>
     </message>
     <message>
         <source>Write Failed</source>
         <translation>Fallo al escribir</translation>
     </message>
     <message>
         <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>
         <source>Textedit</source>
         <translation>Editor de Textos</translation>
     </message>
     <message>
         <source>Textedit detected
 you have unsaved changes
 Go ahead and save?
 </source>
         <translation>Editor de Textos ha detectado que
 tiene cambios sin salvar.
 ¿Los guardo?</translation>
     </message>
     <message>
         <source>Don&apos;t Save</source>
         <translation>No guardar</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancelar</translation>
     </message>
     <message>
         <source>Not enough lines</source>
         <translation>Líneas insuficientes</translation>
     </message>
     <message>
         <source>%1 - Text Editor</source>
         <translation>%1 - Editor de Textos</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>¿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>Save Failed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Fije los Permisos del Fichero</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Fijar permisos fichero para:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>propietario</translation>
     </message>
     <message>
         <source>group</source>
         <translation>grupo</translation>
     </message>
     <message>
         <source>others</source>
         <translation>otros</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Propietario</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Grupo</translation>
     </message>
     <message>
         <source>read</source>
         <translation>leer</translation>
     </message>
     <message>
         <source>write</source>
         <translation>escribir</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>ejecutar</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Aviso</translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation>Error - sin usuario</translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation>Error - sin grupo</translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation>Error fijando propietario o grupo</translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation>Error fijando modo</translation>
     </message>
     <message>
         <source>File Permissions</source>
         <translation>Permisos fichero</translation>
     </message>
 </context>
 </TS>
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,48 +1,41 @@
 <!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>
     </message>
     <message>
         <source>Quit</source>
         <translation>Salir</translation>
     </message>
     <message>
         <source>Click Play to start</source>
         <translation>Pulsa Jugar para empezar</translation>
     </message>
     <message>
         <source>Make your move</source>
         <translation>Haz tu movimiento</translation>
     </message>
     <message>
         <source>You won!</source>
         <translation>¡Tú ganas!</translation>
     </message>
     <message>
         <source>Computer won!</source>
         <translation>¡El ordenador gana!</translation>
     </message>
     <message>
         <source>It&apos;s a draw</source>
         <translation>Empate</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/today.ts b/i18n/es/today.ts
index 9ed5b37..b5172cd 100644
--- a/i18n/es/today.ts
+++ b/i18n/es/today.ts
@@ -1,190 +1,142 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <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>
         <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>
         <translation>Hoy</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>Pinche aquí para obtener el diálogo de configuración</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
         <translation>Hoy por Maximilian Reiß</translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>Cargar qué módulos en qué orden:</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>Mover arriba</translation>
     </message>
     <message>
         <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>
         <translation>Form1</translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
         <translation>Marque aquí si HOY debe ser autoarrancado al arrancar.</translation>
     </message>
     <message>
         <source>autostart on resume?</source>
         <translation>¿arrancar al encender?</translation>
     </message>
     <message>
         <source>tiny banner</source>
         <translation>mini-avisos</translation>
     </message>
     <message>
         <source>Have small banner </source>
         <translation>Tiene aviso pequeño</translation>
     </message>
     <message>
         <source> min</source>
         <translation>min</translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
         <translation>Cuantos minutos ha estado suspendidad la PDA antes que se active la opción de autoarranque</translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation>minutos inactivo</translation>
     </message>
     <message>
         <source> pixel</source>
         <translation>pixel</translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
         <translation>Fijar el tamaño del icono en pixel</translation>
     </message>
     <message>
         <source>icon size</source>
         <translation>tamaño del icono</translation>
     </message>
     <message>
         <source> sec</source>
         <translation> seg</translation>
     </message>
     <message>
         <source>never</source>
         <translation>nunca</translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
         <translation>Con qué frecuencia debe Hoy actualizarse</translation>
     </message>
     <message>
         <source>refresh</source>
         <translation>actualizar</translation>
     </message>
 </context>
 </TS>
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
@@ -1,658 +1,566 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>&lt;h1&gt;Alarm at %1&lt;/h1&gt;&lt;br&gt;</source>
         <translation>&lt;h1&gt;Alarma en %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">En blanco</translation>
     </message>
 </context>
 <context>
     <name>NewTaskDlg</name>
     <message>
         <source>New Task</source>
         <translation type="unfinished">Nueva tarea</translation>
     </message>
     <message>
         <source>Blank task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Using template:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Alarms</source>
         <translation>Alarmas</translation>
     </message>
     <message>
         <source>Information</source>
         <translation>Información</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Estado</translation>
     </message>
     <message>
         <source>Recurrence</source>
         <translation>Repetición</translation>
     </message>
     <message>
         <source>Task Editor</source>
         <translation>Editor de tarear</translation>
     </message>
 </context>
 <context>
     <name>Opie</name>
     <message>
         <source>Todo List</source>
         <translation type="unfinished">Lista de Tareas</translation>
     </message>
     <message>
         <source>Task</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Edit Task</source>
         <translation>Editar Tarea</translation>
     </message>
     <message>
         <source>Enter Task</source>
         <translation>Introducir Tarea</translation>
     </message>
     <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>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Eliminar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation>Nueva plantilla %1</translation>
     </message>
     <message>
         <source>Click here to set the priority of new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Pulse aquí para fijar la prioridad de la nueva tarea.
 
 Esta área se llama barra rápida de tareas.
 
 Le permite añadir rápidamente una nueva tarea a la lista. Esta área puede mostrarse o esconderse en las Opciones del menú.</translation>
     </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>Introduzca aquí la descripción de la nueva tarea.
 
 Esta área se llama barra rápida de tareas.
 
 Le permite añadir rápidamente una nueva tarea a la lista. Esta área puede mostrarse o esconderse en las Opciones del menú.</translation>
     </message>
     <message>
         <source>More</source>
         <translation>Más</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>Pulse aquí para introducir información adicional en una nueva tarea.
 
 Esta área se llama barra rápida de tareas.
 
 Le permite añadir rápidamente una nueva tarea a la lista. Esta área puede mostrarse o esconderse en las Opciones del menú.</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Introducir</translation>
     </message>
     <message>
         <source>Click here to add new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Pulse aquí para añadir una nueva tarea.
 
 Esta área se llama barra rápida de tareas.
 
 Le permite añadir rápidamente una nueva tarea a la lista. Esta área puede mostrarse o esconderse en las Opciones del menú.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
         <source>Click here to reset new task information.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Pulse aquí para reiniciar la información de una nueva tarea.
 
 Esta área se llama barra rápida de tareas.
 
 Le permite añadir rápidamente una nueva tarea a la lista. Esta área puede mostrarse o esconderse en las Opciones del menú.</translation>
     </message>
     <message>
         <source>Data can not be edited, currently syncing</source>
         <translation>Los datos no pueden ser editados, estoy sincronizando</translation>
     </message>
     <message>
         <source>Data can&apos;t be edited, currently syncing</source>
         <translation>Los datos no pueden ser editados, estoy sincronizando</translation>
     </message>
     <message>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>Table View</source>
         <translation>Vista de tablas</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ninguna</translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation>%1 dia(s)</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>New</source>
         <translation>Nueva</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Hora</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Description:</source>
         <translation>Descripción:</translation>
     </message>
     <message>
         <source>Enter brief description of the task here.</source>
         <translation>Introduzca aquí una breve descripción de la tarea.</translation>
     </message>
     <message>
         <source>Complete </source>
         <translation>Completar </translation>
     </message>
     <message>
         <source>Work on </source>
         <translation>En marcha </translation>
     </message>
     <message>
         <source>Buy </source>
         <translation>Comprar </translation>
     </message>
     <message>
         <source>Organize </source>
         <translation>Organizar </translation>
     </message>
     <message>
         <source>Get </source>
         <translation>Conseguir </translation>
     </message>
     <message>
         <source>Update </source>
         <translation>Actualizar </translation>
     </message>
     <message>
         <source>Create </source>
         <translation>Crear </translation>
     </message>
     <message>
         <source>Plan </source>
         <translation>Planificar </translation>
     </message>
     <message>
         <source>Call </source>
         <translation>Llamar </translation>
     </message>
     <message>
         <source>Mail </source>
         <translation>Correo</translation>
     </message>
     <message>
         <source>Select priority of task here.</source>
         <translation>Seleccione aquí la prioridad de la tarea.</translation>
     </message>
     <message>
         <source>Very High</source>
         <translation>Muy alta</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Alta</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Baja</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>Muy baja</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoría:</translation>
     </message>
     <message>
         <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>
 <context>
     <name>TaskEditorStatus</name>
     <message>
         <source>Status:</source>
         <translation>Estado:</translation>
     </message>
     <message>
         <source>Click here to set the current status of this task.</source>
         <translation>Pulse aquí para fijar el estado actual de esta tarea.</translation>
     </message>
     <message>
         <source>Started</source>
         <translation>Iniciada</translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation>Pospuesta</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>Finalizada</translation>
     </message>
     <message>
         <source>Not started</source>
         <translation>No iniciada</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Progreso:</translation>
     </message>
     <message>
         <source>Select progress made on this task here.</source>
         <translation>Seleccione aquí el progreso hecho es esta tarea.</translation>
     </message>
     <message>
         <source>0 %</source>
         <translation>0 %</translation>
     </message>
     <message>
         <source>20 %</source>
         <translation>20 %</translation>
     </message>
     <message>
         <source>40 %</source>
         <translation>40 %</translation>
     </message>
     <message>
         <source>60 %</source>
         <translation>60 %</translation>
     </message>
     <message>
         <source>80 %</source>
         <translation>80 %</translation>
     </message>
     <message>
         <source>100 %</source>
         <translation>100 %</translation>
     </message>
     <message>
         <source>Start Date:</source>
         <translation>Fecha inicio:</translation>
     </message>
     <message>
         <source>Click here to set the date this task was started.</source>
         <translation>Pulse aquí para fijar la fecha en la que fue empezada esta tarea.</translation>
     </message>
     <message>
         <source>Due Date:</source>
         <translation>Fecha vencimiento:</translation>
     </message>
     <message>
         <source>Click here to set the date this task needs to be completed by.</source>
         <translation>Pulse aquí para fijar la fecha en la que esta tarea necesita estar completada.</translation>
     </message>
     <message>
         <source>Completed:</source>
         <translation>Completada:</translation>
     </message>
     <message>
         <source>Click here to mark this task as completed.</source>
         <translation>Pulse aquí para marcar esta tarea como completada.</translation>
     </message>
     <message>
         <source>Click here to set the date this task was completed.</source>
         <translation>Pulse aquí para fijar la fecha en la que esta tarea se completó.</translation>
     </message>
     <message>
         <source>Maintainer Mode:</source>
         <translation>Modo mantenedor:</translation>
     </message>
     <message>
         <source>Click here to set the maintainer&apos;s role.</source>
         <translation>Pulse aquí para fijar el papel de mantenedor.</translation>
     </message>
     <message>
         <source>Nothing</source>
         <translation>Nada</translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation>Responsable</translation>
     </message>
     <message>
         <source>Done By</source>
         <translation>Hecho por</translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation>Coordinador</translation>
     </message>
     <message>
         <source>Maintainer:</source>
         <translation>Mantenedor:</translation>
     </message>
     <message>
         <source>This is the name of the current task maintainer.</source>
         <translation>Este es el nombre del mantenedor actual de la tarea.</translation>
     </message>
     <message>
         <source>test</source>
         <translation>test</translation>
     </message>
     <message>
         <source>Click here to select the task maintainer.</source>
         <translation>Pulse aquí para seleccionar mantenedor de la tarea.</translation>
     </message>
 </context>
 </TS>
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
@@ -1,35 +1,31 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GroupDialog</name>
     <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>
         <translation>Editar usuario</translation>
     </message>
 </context>
 </TS>
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,832 +1,566 @@
 <!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>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <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>
         <source>&amp;Import text file</source>
         <translation>Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
         <translation>Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
         <translation>&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation 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>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation 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>
         <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
         <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
         <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
         <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
         <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
         <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
         <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
         <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
         <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
         <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
         <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
         <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
         <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
         <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
         <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
         <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
-        <source>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>
         <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No document defined.
 You have to create a new document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to save </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 before continuing?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Now you have to enter
 a password twice for your
 newly created document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&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>
         <source>&lt;P&gt;You must create a new document first. Ok to create?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Password Manager&lt;br&gt;ZSafe version 2.1.2&lt;br&gt;&lt;/b&gt;by Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Translations by Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,573 +1,487 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation>Nom complet</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Contact</translation>
     </message>
     <message>
         <source>Pick</source>
         <translation>Sélectionner</translation>
     </message>
 </context>
 <context>
     <name>AbView</name>
     <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>
     </message>
     <message>
         <source>Edit Contact</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation>Type de requête</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>Utiliser les expressions régulières</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>Utiliser des jokers (*, ?)</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Sensible à la casse</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Courrier</translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation>Préferer QT-Mail</translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation>Préferer Opie-Mail</translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation>Note : QT-Mail est fourni dans la ROM
 par défaut de SHARP. Opie-Mail est
 founi gratuitement !</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Divers</translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation>Préférences recherche</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Police</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Petite</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normale</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Grande</translation>
     </message>
     <message>
         <source>Order</source>
         <translation>Ordre</translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation>Ordre de recherche de contact : </translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Haut</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Bas</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Ajouter</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Effacer</translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation>Configuration</translation>
     </message>
     <message>
         <source>Click on tab to select one</source>
         <translation>Cliquez un onglet pour le sélectionner</translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation>Paramètres du type de recherche</translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation>Si sélectionné, le champ Recherche attend une expression régulière</translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
         <translation>Le champ Recherche utilise de simples jokers</translation>
     </message>
     <message>
         <source>If selected, search differs between upper and lower chars</source>
         <translation>Si sélectionné, la recherche différencie majuscules et minuscules</translation>
     </message>
     <message>
         <source>Font size for list- and card view</source>
         <translation>Taille des polices des vues liste et fiche</translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
         <translation>Paramètres des polices des vues liste et fiche</translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation>Utiliser l&apos;application de messagerie de Sharp si disponible</translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</source>
         <translation>Utiliser Opie-Mail si installé</translation>
     </message>
     <message>
         <source>Move selected attribute one line up</source>
         <translation>Déplace le champ sélectionné d&apos;une ligne vers le haut</translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation>Déplace le champ sélectionné d&apos;une ligne vers le bas</translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation>Liste des champs disponibles</translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation>Ajoute le champ sélectionné dans la liste juste au-dessus</translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation>Supprime le champ sélectionné de la liste du dessus</translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation>L&apos;ordre (haut -&gt; bas) définit le premier élément affiché dans la deuxième colonne en mode liste</translation>
     </message>
     <message>
         <source>Tool-/Menubar</source>
         <translation>Outils-/Barre de Menus</translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation>Fixe</translation>
     </message>
     <message>
         <source>Switch to fixed menu-/toolbars after restarting application !</source>
         <translation>Utiliser un menu-/barre d&apos;outils fixe après redémarrage de l&apos;application !</translation>
     </message>
     <message>
         <source>Moveable</source>
         <translation>Mobile</translation>
     </message>
     <message>
         <source>Switch to moveable menu-/toolbars after restarting application !</source>
         <translation>Utiliser un menu-/barre d&apos;outils déplaçable après redémarrage de l&apos;application !</translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>First Name</source>
         <translation>Prénom</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>2nd Prénom</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Nom</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Suffixe</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Classer sous</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Fonction</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Ville</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Département</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>Pays</translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation>Nom entier...</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Société</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Catégorie</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Note...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Général</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Bureau</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Domicile</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Adresse</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>Code Postal</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>Etats Unies</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Grande Bretagne</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>Japon</translation>
     </message>
     <message>
         <source>France</source>
         <translation>France</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>Allemagne</translation>
     </message>
     <message>
         <source>Norway</source>
         <translation>Norvège</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>Canada</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Homme</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Femme</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Détails</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>Note</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>Editer nom</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Contacts</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation>Albanie</translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation>Algérie</translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation>American Samoa</translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation>Andorre</translation>
     </message>
     <message>
         <source>Angola</source>
         <translation>Angola</translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation>Anguilla</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>Argentine</translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation>Aruba</translation>
     </message>
     <message>
         <source>Australia</source>
         <translation>Australie</translation>
     </message>
     <message>
         <source>Austria</source>
         <translation>Autriche</translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation>Azerbaijan</translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation>Bahamas</translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation>Bahreïn</translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation>Bangladesh</translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation>Barbade</translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation>Biélorussie</translation>
     </message>
@@ -1022,552 +936,385 @@ founi gratuitement !</translation>
     <message>
         <source>Oman</source>
         <translation>Oman</translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation>Pakistan</translation>
     </message>
     <message>
         <source>Palau</source>
         <translation>Belau</translation>
     </message>
     <message>
         <source>Panama</source>
         <translation>Panama</translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation>Papouasie Nouvelle Guinée</translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation>Paraguay</translation>
     </message>
     <message>
         <source>Peru</source>
         <translation>Pérou</translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation>Philippines</translation>
     </message>
     <message>
         <source>Poland</source>
         <translation>Pologne</translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation>Portugal</translation>
     </message>
     <message>
         <source>Puerto Rico</source>
         <translation>Puerto Rico</translation>
     </message>
     <message>
         <source>Qatar</source>
         <translation>Qatar</translation>
     </message>
     <message>
         <source>Reunion</source>
         <translation>Ile de la Réunion</translation>
     </message>
     <message>
         <source>Romania</source>
         <translation>Roumanie</translation>
     </message>
     <message>
         <source>Russia</source>
         <translation>Russie</translation>
     </message>
     <message>
         <source>Rwanda</source>
         <translation>Rwanda</translation>
     </message>
     <message>
         <source>Saint Lucia</source>
         <translation>Sainte-Lucie</translation>
     </message>
     <message>
         <source>Samoa</source>
         <translation>Samoa</translation>
     </message>
     <message>
         <source>San Marino</source>
         <translation>San Marin</translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
         <translation>Arabie Saoudite</translation>
     </message>
     <message>
         <source>Senegal</source>
         <translation>Sénégal</translation>
     </message>
     <message>
         <source>Seychelles</source>
         <translation>Seychelles</translation>
     </message>
     <message>
         <source>Sierra Leone</source>
         <translation>Sierra Leone</translation>
     </message>
     <message>
         <source>Singapore</source>
         <translation>Singapour</translation>
     </message>
     <message>
         <source>Slovakia</source>
         <translation>Slovaquie</translation>
     </message>
     <message>
         <source>Slovenia</source>
         <translation>Slovénie</translation>
     </message>
     <message>
         <source>Solomon Islands</source>
         <translation>Iles Salomon</translation>
     </message>
     <message>
         <source>Somalia</source>
         <translation>Somalie</translation>
     </message>
     <message>
         <source>South Africa</source>
         <translation>Afrique du Sud</translation>
     </message>
     <message>
         <source>Spain</source>
         <translation>Espagne</translation>
     </message>
     <message>
         <source>Sri Lanka</source>
         <translation>Sri Lanka</translation>
     </message>
     <message>
         <source>St. Helena</source>
         <translation>St. Hélène</translation>
     </message>
     <message>
         <source>Sudan</source>
         <translation>Soudan</translation>
     </message>
     <message>
         <source>Suriname</source>
         <translation>Suriname</translation>
     </message>
     <message>
         <source>Swaziland</source>
         <translation>Swaziland</translation>
     </message>
     <message>
         <source>Sweden</source>
         <translation>Suède</translation>
     </message>
     <message>
         <source>Switzerland</source>
         <translation>Suisse</translation>
     </message>
     <message>
         <source>Taiwan</source>
         <translation>Taiwan</translation>
     </message>
     <message>
         <source>Tajikistan</source>
         <translation>Tajikistan</translation>
     </message>
     <message>
         <source>Tanzania</source>
         <translation>Tanzanie</translation>
     </message>
     <message>
         <source>Thailand</source>
         <translation>Thaïlande</translation>
     </message>
     <message>
         <source>Togo</source>
         <translation>Togo</translation>
     </message>
     <message>
         <source>Tokelau</source>
         <translation>Tokelau</translation>
     </message>
     <message>
         <source>Tonga</source>
         <translation>Tonga</translation>
     </message>
     <message>
         <source>Tunisia</source>
         <translation>Tunisie</translation>
     </message>
     <message>
         <source>Turkey</source>
         <translation>Turquie</translation>
     </message>
     <message>
         <source>Turkmenistan</source>
         <translation>Turkmenistan</translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation>Tuvalu</translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation>Ouganda</translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation>Ukraine</translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation>Uruguay</translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation>Uzbekistan</translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation>Vanuatu</translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation>Vénézuela</translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation>Iles Vierges</translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation>Sahara Occidental</translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation>Yemen</translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation>Yougoslavie</translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation>Zambie</translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation>Zimbabwe</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Date de Naissance</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Anniversaire</translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation>Koweit</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Inconnu</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>Afghanistan</source>
         <translation>Afghanistan</translation>
     </message>
     <message>
         <source>Antarctica</source>
         <translation>Antartique</translation>
     </message>
     <message>
         <source>Armenia</source>
         <translation>Arménie</translation>
     </message>
     <message>
         <source>Bolivia</source>
         <translation>Bolivie</translation>
     </message>
     <message>
         <source>Cameroon</source>
         <translation>Cameroun</translation>
     </message>
     <message>
         <source>Ghana</source>
         <translation>Ghana</translation>
     </message>
     <message>
         <source>Guadeloupe</source>
         <translation>Guadeloupe</translation>
     </message>
     <message>
         <source>Guinea-Bissau</source>
         <translation>Guinée-Bissau</translation>
     </message>
     <message>
         <source>Jamaica</source>
         <translation>Jamaïque</translation>
     </message>
     <message>
         <source>Kiribati</source>
         <translation>Kiribati</translation>
     </message>
     <message>
         <source>Kyrgyzstan</source>
         <translation>Kyrgyzstan</translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
         <translation>Zone de souveraineté Palestinienne</translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
         <translation>Iles Pitcairn</translation>
     </message>
     <message>
         <source>Vietnam</source>
         <translation>Vietnam</translation>
     </message>
     <message>
         <source>Press to enter last- middle and firstname</source>
         <translation>Cliquez ce bouton pour saisir nom, prénom et second prénom</translation>
     </message>
     <message>
         <source>Enter fullname directly ! If you have a lastname with multiple words ( for instance &quot;de la Guerra&quot;), please write &lt;lastname&gt;,&lt;firstnames&gt; like this: &quot;de la Guerra, Carlos Pedro&quot;</source>
         <translation>Entrez le nom complet directement ! Si le nom est composé de plusieurs mots (par exemple &quot;De Gaulle&quot;), saisissez &lt;Nom&gt;,&lt;Prénom&gt; comme ceci : &quot;De Gaulle, Général&quot;</translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation>Fonction dans l&apos;entreprise..</translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation>Par exemple &quot;jr.&quot;..</translation>
     </message>
     <message>
         <source>The working place of the contact</source>
         <translation>Le lieu de travail du contact</translation>
     </message>
     <message>
         <source>Press to select attribute to change</source>
         <translation>Cliquez dessus pour sélectionnez les attributs à modifier</translation>
     </message>
     <message>
         <source>Press to select how to store the name (and howto show it in the listview)</source>
         <translation>Permet de choisir le format du nom complet (et comment il s&apos;affiche en mode liste)</translation>
     </message>
     <message>
         <source></source>
         <translation></translation>
     </message>
 </context>
 <context>
     <name>Opie</name>
     <message>
         <source>Contact</source>
         <translation type="unfinished">Contact</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation type="unfinished">Contacts</translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation type="unfinished">Démarrer recherche</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation type="unfinished">Ecrire un e-mail à</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation type="unfinished">Importer vCard</translation>
     </message>
     <message>
         <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
@@ -1,457 +1,362 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>AdvancedFm</source>
         <translation>Explorateur</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Fichier</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Vue</translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation>Afficher fichiers cachés</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>Nouveau dossier</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Renommer</translation>
     </message>
     <message>
         <source>Run Command</source>
         <translation>Exécuter commande</translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation>Exécuter commande avec sortie écran</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Taille</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Oui</translation>
     </message>
     <message>
         <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>
         <source>Ir sent.</source>
         <translation>Envoie Ir.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>Changer de répertoire</translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>Exécuter</translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation>Ouvrir comme texte</translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation>Créer un lien symbolique</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copier</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>Déplacer</translation>
     </message>
     <message>
         <source>File Info</source>
         <translation>Info fichier</translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation>Définir permissions</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Propriétés</translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation>Transmission fichier</translation>
     </message>
     <message>
         <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>
         <source>Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1 files?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1 and all it&apos;s contents?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really copy %1 files?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 already  exists. Ok to overwrite?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Could not copy %1 to %2&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy %1 As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt; %1 already exists. Ok to overwrite?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not copy %1 to %2&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt; %1 already exists. Do you really want to delete it?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not move %1&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not copy %1 to %2&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Enregistrer la sortie dans un fichier</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Sortie écran</translation>
     </message>
     <message>
         <source>Process could not start</source>
         <translation>Le processus n&apos;a pas pu démarrer</translation>
     </message>
     <message>
         <source>Error
 </source>
         <translation>Erreur
 </translation>
     </message>
     <message>
         <source>
 Finished
 </source>
         <translation>
 Terminé
 </translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Définir permissions</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Définir permissions de : </translation>
     </message>
     <message>
         <source>owner</source>
         <translation>propriétaire</translation>
     </message>
     <message>
         <source>group</source>
         <translation>groupe</translation>
     </message>
     <message>
         <source>others</source>
         <translation>autres</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Propriétaire</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Groupe</translation>
     </message>
     <message>
         <source>read</source>
         <translation>lire</translation>
     </message>
     <message>
         <source>write</source>
         <translation>écrire</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>exécuter</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Avertissement</translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation>Erreur - aucun utilisateur</translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation>Erreur - aucun groupe</translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation>Erreur lors du changement de groupe</translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation>Erreur lors du changement de mode</translation>
     </message>
     <message>
         <source>filePermissions</source>
         <translation>Permissions fichier</translation>
     </message>
 </context>
 </TS>
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
@@ -1,295 +1,234 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Appearance</name>
     <message>
         <source>Settings...</source>
         <translation>Préférences...</translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation>Thème actuel</translation>
     </message>
     <message>
         <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>
         <source>Drop down list</source>
         <translation>Liste déroulante</translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation>Liste déroulante + icônes</translation>
     </message>
     <message>
         <source>Top</source>
         <translation>Haut</translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation>Bas</translation>
     </message>
     <message>
         <source>Style</source>
         <translation>Style</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Police</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Couleurs</translation>
     </message>
     <message>
         <source>Windows</source>
         <translation>Fenêtre</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Avancé</translation>
     </message>
     <message>
-        <source>Restart</source>
-        <translation 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é.
 
 Note : Cette option n&apos;est pas disponible pour tous les styles.</translation>
     </message>
     <message>
         <source>Window decorations control the way the application title bar and its buttons appear.
 
 Click here to select an available decoration.</source>
         <translation>Les décorations de fenêtres contrôlent la manière dont les barres de titres et les bouttons des applications apparaissent.
 
 Cliquez ici pour sélectionner une décoration disponible.</translation>
     </message>
     <message>
         <source>Select the desired name, style and size of the default font applications will use.</source>
         <translation>Sélectionne le nom, le style et la taille de la police que les applications utiliseront par défaut.</translation>
     </message>
     <message>
         <source>Color schemes are a collection of colors which are used for various parts of the display.
 
 Click here to select an available scheme.</source>
         <translation>Les thèmes de couleurs sont une collection de couleurs utilisés à différents endroits sur les fenêtres.
 
 Cliquez ici pour sélectionner un thème.</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation>Cliquez ici pour que les onglets apparaissent en haut de la fenêtre.</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation>Cliquez ici pour les onglets apparaissent en bas de la fenêtre.</translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation>Ceci est un aperçu de la fenêtre. Regardez ici pour voir les changements apportés.</translation>
     </message>
     <message>
         <source>Appearance Settings</source>
         <translation>Préférences d&apos;Apparence</translation>
     </message>
     <message>
         <source>Rotation direction:</source>
         <translation>Rotation : </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>
         <translation>Editer le thème</translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation>Cliquez ici pour sélectionner une couleur pour : </translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
         <translation>Exemple</translation>
     </message>
     <message>
         <source>Normal Item</source>
         <translation>Control simple</translation>
     </message>
     <message>
         <source>Disabled Item</source>
         <translation>Control désactivé</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Menu</translation>
     </message>
     <message>
         <source>Normal Text</source>
         <translation>Texte simple</translation>
     </message>
     <message>
         <source>Highlighted Text</source>
         <translation>Texte surligné</translation>
     </message>
     <message>
         <source>Button</source>
         <translation>Bouton</translation>
     </message>
     <message>
         <source>Check Box</source>
         <translation>Case à cocher</translation>
     </message>
     <message>
         <source>Sample window using the selected settings.</source>
         <translation>Fenêtre d&apos;exemple utilisant les nouveaux paramètres.</translation>
     </message>
 </context>
 </TS>
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,923 +1,671 @@
 <!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>
     <message>
         <source>Reading configuration...</source>
         <translation>Lecture de la configuration...</translation>
     </message>
 </context>
 <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>
         <source>Install
 </source>
         <translation>Installer</translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation>Mise à jour
 </translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation>(Réinstaller)</translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation>(Mise à jour)</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation>Destination</translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation>Espace dispo</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Sortie</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Démarrer</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Options</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tous</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Texte</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation>Abandonner</translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation>
 **  L&apos;utilisateur à annuler l&apos;opération **</translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation>** Processus annulé **</translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <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>
     </message>
     <message>
         <source>Force Remove</source>
         <translation>Forcer la suppression</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation>Forcer la ré-écriture</translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation>Niveau d&apos;information</translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation>Erreurs seulement</translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation>Messages normaux</translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation>Messages d&apos;information</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation>Problème rencontré</translation>
     </message>
 </context>
 <context>
     <name>Ipkg</name>
     <message>
         <source>Dealing with package %1</source>
         <translation>Traitement du paquet %1</translation>
     </message>
     <message>
         <source>Removing symbolic links...
 </source>
         <translation>Suppression des liens symboliques...
 </translation>
     </message>
     <message>
         <source>Creating symbolic links for %1.</source>
         <translation>Création de liens symboliques pour %1.</translation>
     </message>
     <message>
         <source>Creating symbolic links for %1</source>
         <translation>Création de liens symboliques pour %1</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>Terminé</translation>
     </message>
     <message>
         <source>Removing status entry...</source>
         <translation>Suppression du statut...</translation>
     </message>
     <message>
         <source>status file - </source>
         <translation>fichier statut - </translation>
     </message>
     <message>
         <source>package - </source>
         <translation>paquet -</translation>
     </message>
     <message>
         <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>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation>AQPkg - Gestionnaire de Paquets</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation>Tapez le texte à rechercher ici.</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation>Cliquez ici pour cacher la Barre d&apos;Accès Rapide.</translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation>Mise à jour les listes</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation>Cliquez ici pour mettre les listes de paquets des serveurs à jour.</translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation>Mise à jour</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation>Cliquez ici pour mettre à jour tous les paquets installés si une nouvelle version est disponible.</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Télécharger</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation>Cliquer ici pour télécharger le(s) paquet(s) sélectionné(s).</translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation>Appliquer les modifications</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation>Cliquez ici pour installer, enlever ou mettre à jour le(s) paquet(s) sélectionné(s).</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Actions</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation>Afficher les paquets non installés</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation>Cliquez ici pour afficher les paquets non installés disponibles.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation>Afficher les paquets installés</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation>Cliquez ici pour afficher les paquets installés sur cet appareil.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation>Afficher les paquets mis à jour</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation>Cliquez ici pour afficher les paquets installés sur cet appareil et dont une version plus récente est disponible.</translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation>Filtrer par catégorie</translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation>Cliquez ici pour afficher les paquets appartenant à une catégorie.</translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation>Définir le filtre par catégorie</translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation>Cliquez ici pour changer la catégorie de paquets à utiliser comme filtre.</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Rechercher</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation>Cliquez ici pour rechercher un texte dans les noms de paquets.</translation>
     </message>
     <message>
         <source>Find next</source>
         <translation>Trouver suivant</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation>Cliquez ici pour trouver le paquets suivant contenant le texte recherché.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation>Clavier Accès Rapide</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation>Cliquez ici pour afficher/cacher le clavier permettant le déplacement rapide dans la liste des paquets.</translation>
     </message>
     <message>
         <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>
         <source>Packages</source>
         <translation>Paquets</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 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
 n&apos;est PAS recommandée !
 
 Etes-vous sûr ?</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Avertissement</translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
         <translation>Mise à jour des paquets installés</translation>
     </message>
     <message>
         <source>Are you sure you wish to delete
 %1?</source>
         <translation>Etes-vous sûr de vouloir effacer
 %1 ?</translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation>Etes-vous sûr ?</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Non</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Oui</translation>
     </message>
     <message>
         <source>Download to where</source>
         <translation>Télécharger dans</translation>
     </message>
     <message>
         <source>Enter path to download to</source>
         <translation>Entrez la destination du téléchargement</translation>
     </message>
     <message>
         <source>Install Remote Package</source>
         <translation>Installer paquet distant</translation>
     </message>
     <message>
         <source>Enter package location</source>
         <translation>Entrez la chemin du paquet</translation>
     </message>
     <message>
         <source>Nothing to do</source>
         <translation>Rien à faire</translation>
     </message>
     <message>
         <source>No packages selected</source>
         <translation>Aucun paquet sélectionné</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Do you wish to remove or reinstall
 %1?</source>
         <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>
         <translation>&lt;p&gt;&lt;b&gt;Installé Sur&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Taille&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Nom fichier&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Version installée&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Version disponible&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>Package Information</source>
         <translation>Information paquet</translation>
     </message>
     <message>
         <source>Package information is unavailable</source>
         <translation>Informations sur le paquet non disponibles</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Fermer</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Installed packages</source>
         <translation>Paquets installés</translation>
     </message>
     <message>
         <source>Local packages</source>
         <translation>Paquets locaux</translation>
     </message>
     <message>
         <source>N/A</source>
         <translation>N/A</translation>
     </message>
     <message>
         <source>Package - %1
               version - %2</source>
         <translation>Paquets - %1
              version - %2</translation>
     </message>
     <message>
         <source>
               inst version - %1</source>
         <translation>
             version inst. - %1</translation>
     </message>
     <message>
         <source>Version string is empty.</source>
         <translation>N° de version indisponible.</translation>
     </message>
     <message>
         <source>Epoch in version is not number.</source>
         <translation>Nombre incorrect.</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <source>Proxies</source>
         <translation>Proxies</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nouveau</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Serveur</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nom : </translation>
     </message>
     <message>
         <source>Address:</source>
         <translation>Adresse : </translation>
     </message>
     <message>
         <source>Active Server</source>
         <translation>Serveur actif</translation>
     </message>
     <message>
         <source>Update</source>
         <translation>Ajouter - Mettre à jour</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation>Destination</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Emplacement : </translation>
     </message>
     <message>
         <source>Link to root</source>
         <translation>Lien vers la racine</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
         <translation>Proxy HTTP</translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation>Activé</translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation>Proxy FTP</translation>
     </message>
     <message>
         <source>Username:</source>
         <translation>Nom utilisateur : </translation>
     </message>
     <message>
         <source>Password:</source>
         <translation>Mot de passe : </translation>
     </message>
 </context>
 </TS>
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,172 +1,152 @@
 <!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>
     </message>
     <message>
         <source>Backup Failed!</source>
         <translation>Echec sauvegarde !</translation>
     </message>
     <message>
         <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>
         <source>Restore Backup...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;%1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore</source>
         <translation type="unfinished">Restauration</translation>
     </message>
     <message>
         <source>Would you really overwrite your local data?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <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>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ErrorDialog</name>
     <message>
         <source>Error Info</source>
         <translation>Info erreur</translation>
     </message>
     <message>
         <source>Error Message:</source>
         <translation>Message d&apos;erreur : </translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
 </context>
 </TS>
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,340 +1,332 @@
 <!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>
         <source>CE</source>
         <translation>CE</translation>
     </message>
     <message>
         <source>log</source>
         <translation>log</translation>
     </message>
     <message>
         <source>ln</source>
         <translation>ln</translation>
     </message>
     <message>
         <source>(</source>
         <translation>(</translation>
     </message>
     <message>
         <source>)</source>
         <translation>)</translation>
     </message>
     <message>
         <source>sin</source>
         <translation>sin</translation>
     </message>
     <message>
         <source>cos</source>
         <translation>cos</translation>
     </message>
     <message>
         <source>tan</source>
         <translation>tan</translation>
     </message>
     <message>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
         <source>+/-</source>
         <translation>+/-</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>=</source>
         <translation>=</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>.</source>
         <translation>,</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <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>
         <translation>Masse</translation>
     </message>
     <message>
         <source>Distance</source>
         <translation>Distance</translation>
     </message>
     <message>
         <source>Area</source>
         <translation>Surface</translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation>Températures</translation>
     </message>
     <message>
         <source>Volume</source>
         <translation>Volume</translation>
     </message>
     <message>
         <source>acres</source>
         <translation>acres</translation>
     </message>
     <message>
         <source>&#xb0;C</source>
         <translation>°C</translation>
     </message>
     <message>
         <source>carats</source>
         <translation>carats</translation>
     </message>
     <message>
         <source>cm</source>
         <translation>cm</translation>
     </message>
     <message>
         <source>cu cm</source>
         <translation>cm^3</translation>
     </message>
     <message>
         <source>cu ft</source>
         <translation>pieds^3</translation>
     </message>
     <message>
         <source>cu in</source>
         <translation>pouces^3</translation>
     </message>
     <message>
         <source>&#xb0;F</source>
         <translation>°F</translation>
     </message>
     <message>
         <source>fl oz (US)</source>
         <translation>onces liquide (US)</translation>
     </message>
     <message>
         <source>ft</source>
         <translation>pieds</translation>
     </message>
     <message>
         <source>g</source>
         <translation>g</translation>
     </message>
     <message>
         <source>gal (US)</source>
         <translation>gal (US)</translation>
     </message>
     <message>
         <source>hectares</source>
         <translation>hectares</translation>
     </message>
     <message>
         <source>in</source>
         <translation>pouces</translation>
     </message>
     <message>
         <source>kg</source>
         <translation>Kg</translation>
     </message>
     <message>
         <source>km</source>
         <translation>Km</translation>
     </message>
     <message>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
         <source>lb</source>
         <translation>livres</translation>
     </message>
     <message>
         <source>Lg tons</source>
         <translation>Lg tons</translation>
     </message>
     <message>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
         <source>mg</source>
         <translation>mg</translation>
     </message>
     <message>
         <source>mi</source>
         <translation>milles</translation>
     </message>
     <message>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
         <source>mm</source>
         <translation>mm</translation>
     </message>
     <message>
         <source>naut. mi</source>
         <translation>milles naut</translation>
     </message>
     <message>
         <source>oz</source>
         <translation>oz</translation>
     </message>
     <message>
         <source>points</source>
         <translation>points</translation>
     </message>
     <message>
         <source>pt</source>
         <translation>pintes</translation>
     </message>
     <message>
         <source>qt</source>
         <translation>quarts</translation>
     </message>
     <message>
         <source>sq cm</source>
         <translation>cm^2</translation>
     </message>
     <message>
         <source>sq ft</source>
         <translation>pieds^2</translation>
     </message>
     <message>
         <source>sq in</source>
         <translation>pouces^2</translation>
     </message>
     <message>
         <source>sq km</source>
         <translation>Km^2</translation>
     </message>
     <message>
         <source>sq m</source>
         <translation>m^2</translation>
     </message>
     <message>
         <source>sq mi</source>
         <translation>milles^2</translation>
     </message>
     <message>
         <source>sq mm</source>
         <translation>mm^2</translation>
     </message>
     <message>
         <source>sq yd</source>
         <translation>yard^2</translation>
     </message>
     <message>
         <source>st</source>
         <translation>st</translation>
     </message>
     <message>
         <source>St tons</source>
         <translation>St tons</translation>
     </message>
     <message>
         <source>tblspoon</source>
         <translation>cuil. à soupe</translation>
     </message>
     <message>
         <source>teaspoons</source>
         <translation>cuil. à café</translation>
     </message>
     <message>
         <source>tonnes</source>
         <translation>tonnes</translation>
     </message>
     <message>
         <source>yd</source>
         <translation>yards</translation>
     </message>
 </context>
 </TS>
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
@@ -1,756 +1,648 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation>Livre de comptes</translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation>Nouveau livre</translation>
     </message>
     <message>
         <source>Info</source>
         <translation>Propriétés</translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation>Transactions</translation>
     </message>
     <message>
         <source>Charts</source>
         <translation>Graphiques</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nom : </translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation>Entrez 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>
         <source>Enter account number for this checkbook here.</source>
         <translation>Entrez ici le n° du compte de ce livre de comptes.</translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation>N° PIN : </translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation>Entrez ici le numéro de PIN pour ce livre de comptes .</translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation>Solde : </translation>
     </message>
     <message>
         <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>
         <source>Description</source>
         <translation>Description</translation>
     </message>
     <message>
         <source>Amount</source>
         <translation>Montant</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nouveau</translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation>Cliquez ici pour ajouter une nouvelle transaction.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Modifier</translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation>Sélectionnez une transaction et cliquez ici pour la modifier.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation>Sélectionnez un livre de comptes et cliquez ici pour l&apos;effacer.</translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation>Sélectionnez le graphique désiré ci-dessous et cliquez sur le boutton Dessiner.</translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation>Cliquez ici pour sélectionner le type de graphique désiré.</translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation>Solde du compte</translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation>Retrait par catégorie</translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation>Dépôt par catégorie</translation>
     </message>
     <message>
         <source>Draw</source>
         <translation>Dessiner</translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation>Cliquez ici pour dessiner le graphique sélectionné.</translation>
     </message>
     <message>
-        <source>Current balance: %1%2</source>
-        <translation 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>
         <source>Num</source>
         <translation>Num</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Entrer mot de passe</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Veuillez entrer votre mot de passe : </translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation>Confirmer le mot de passe</translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation>Veuillez confirmer votre mot de passe : </translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation>Veuillez entrer votre mot de passe pour confirmer la désactivation de la protection par mot de passe : </translation>
     </message>
     <message>
         <source>Sort by:</source>
         <translation>Trier par : </translation>
     </message>
     <message>
         <source>Select checkbook sorting here.</source>
         <translation>Sélectionnez la méthode de trie du livre de compte ici.</translation>
     </message>
     <message>
         <source>Entry Order</source>
         <translation>Ordre d&apos;entrée</translation>
     </message>
     <message>
         <source>Number</source>
         <translation>Nombre</translation>
     </message>
     <message>
         <source>Id</source>
         <translation>Id</translation>
     </message>
     <message>
         <source>SortDate</source>
         <translation>Trier Date</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>Solde</translation>
     </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation>Configurer &quot;Livre de compte&quot;</translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation>Entrer le symbole de la devise : </translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation>Entrez le symbole de la devise locale ici.</translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation>Montrer si le livre de comptes est protégé
 par mot de passe</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
         <translation>Cliquez ici pour sélectionner si, oui ou non, la fenêtre principale affichera si le &quot;livre de compte&quot; est protégé par mot de passe.</translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation>Montrer le solde des livres de comptes</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation>Cliquez ici pour sélectionner si, oui ou non, la fenêtre principale affichera le solde pour chaque livre de comptes.</translation>
     </message>
     <message>
         <source>&amp;Settings</source>
         <translation>&amp;Paramètres</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>New Account Type</source>
         <translation>Nouveau type de compte</translation>
     </message>
     <message>
         <source>&amp;Account Types</source>
         <translation>&amp;Types de compte</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Catégorie</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>Nouvelle catégorie</translation>
     </message>
     <message>
         <source>Expense</source>
         <translation>Dépense</translation>
     </message>
     <message>
         <source>Income</source>
         <translation>Revenu</translation>
     </message>
     <message>
         <source>&amp;Categories</source>
         <translation>&amp;Catégories</translation>
     </message>
     <message>
         <source>Payee</source>
         <translation>Bénéficiaire</translation>
     </message>
     <message>
         <source>New Payee</source>
         <translation>Nouveau bénéficiaire</translation>
     </message>
     <message>
         <source>&amp;Payees</source>
         <translation>&amp;Bénéficiaires</translation>
     </message>
     <message>
         <source>Open last checkbook</source>
         <translation>Ouvrir dernier Livre de Comptes</translation>
     </message>
     <message>
         <source>Click here to select whether the last open checkbook will be opened at startup.</source>
         <translation>Cliquez ici pour que le dernier livre de compte utilisé soit ouvert au démarrage.</translation>
     </message>
     <message>
         <source>Show last checkbook tab</source>
         <translation>Afficher dernier onglet du livre de compte</translation>
     </message>
     <message>
         <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
         <translation>Cliquez ici pour définir si le dernier onglet affiché du livre de compte doit être sélectionné.</translation>
     </message>
     <message>
         <source>Save new description as payee</source>
         <translation>Enregistrer nouvelle description comme bénéficiaire</translation>
     </message>
     <message>
         <source>Click here to save new descriptions in the list of payess.</source>
         <translation>Cliquez ici pour enregistrer la nouvelle description dans la liste des bénéficiaires.</translation>
     </message>
 </context>
 <context>
     <name>ListEdit</name>
     <message>
         <source>Add</source>
         <translation>Ajouter</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation>Livre de comptes</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nouveau</translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation>Cliquez ici pour créer un nouveau livre de comptes.
 
 Vous pouvez aussi sélectionner &quot;Nouveau&quot; à partir du menu &quot;Livre de Comptes&quot;.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Modifier</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation>Sélectionnez un livre de comptes puis cliquez ici pour le modifier.
 
 Vous pouvez aussi sélectionner &quot;Modifier&quot; à partir du menu de &quot;Livre de Comptes&quot;, ou bien cliquer
 en maintenant appuyé sur le nom d&apos;un livre de comptes.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation>Sélectionnez un livre de comptes puis cliquez ici pour le détruire.
 
 Vous pouvez aussi cliquer sur &quot;Supprimer&quot; à partir du menu de &quot;Livre de comptes&quot;.</translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation>Voici une liste de tous les livres de compte disponibles actuellement.</translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation>Supprimer un livre de comptes</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Configurer</translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation>Cliquez ici pour configurer cette application.</translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation>Nom du livre de comptes</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>Solde</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Entrer mot de passe</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Entrez votre un mot de passe : </translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Modifier</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nouveau</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>Savings</source>
         <translation>Epargne</translation>
     </message>
     <message>
         <source>Checking</source>
         <translation>Compte chèques</translation>
     </message>
     <message>
         <source>CD</source>
         <translation>CD</translation>
     </message>
     <message>
         <source>Money market</source>
         <translation>Liquidités</translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation>Fond de pension</translation>
     </message>
     <message>
         <source>Other</source>
         <translation>Autre</translation>
     </message>
     <message>
         <source>Expense</source>
         <translation>Dépense</translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation>Véhicule</translation>
     </message>
     <message>
         <source>Bills</source>
         <translation>Factures</translation>
     </message>
     <message>
         <source>CDs</source>
         <translation>CDs</translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation>Vêtements</translation>
     </message>
     <message>
         <source>Computer</source>
         <translation>Ordinateur</translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation>DVDs</translation>
     </message>
     <message>
         <source>Electronics</source>
         <translation>Electronique</translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation>Loisirs</translation>
     </message>
     <message>
         <source>Food</source>
         <translation>Alimentation</translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation>Carburant</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Divers</translation>
     </message>
     <message>
         <source>Movies</source>
         <translation>Cinéma</translation>
     </message>
     <message>
         <source>Rent</source>
         <translation>Location</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Voyage</translation>
     </message>
     <message>
         <source>Income</source>
         <translation>Revenu</translation>
     </message>
     <message>
         <source>Work</source>
         <translation>Professionnel</translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation>Membre de la famille</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation>Crédit divers</translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation>Transaction sur </translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation>Débit</translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation>Sélectionnez ici le type d&apos;opération, débit ou crédit.</translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation>Crédit</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Date:</translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation>Sélectionnez la date de l&apos;opération ici.</translation>
     </message>
     <message>
         <source>Number:</source>
         <translation>Numéro : </translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation>Entrez le numéro de chèque ici.</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Description : </translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation>Entrez la description de l&apos;opération ici.</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Catégorie : </translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation>Sélectionnez la catégorie de l&apos;opération ici.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Type : </translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation>Sélectionnez le type d&apos;opération ici.
 
 Les options disponibles varient suivant le type d&apos;opération : débit ou crédit.</translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation>Montant : </translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation>Entrez le montant de l&apos;opération ici.
 
 La valeur entrée devrait toujours être positive.</translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation>Frais : </translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation>Entrez le montant des frais bancaires associés à l&apos;opération.
 
 La valeur entrée devrait toujours être positive.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notes : </translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation>Entrez ici les informations complémentaires sur l&apos;opération.</translation>
     </message>
     <message>
-        <source>Automobile</source>
-        <translation 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
@@ -1,288 +1,207 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AlarmDlg</name>
     <message>
         <source>Clock</source>
         <translation type="unfinished">Horloge</translation>
     </message>
     <message>
         <source>Snooze</source>
         <translation type="unfinished">En sommeil</translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AlarmDlgBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>TextLabel1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Snooze</source>
         <translation type="unfinished">En sommeil</translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thu</source>
         <comment>Thursday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fri</source>
         <comment>Friday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat</source>
         <comment>Saturday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sun</source>
         <comment>Sunday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lap/Split</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Daily Alarm:&lt;/b&gt;&lt;p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily alarm requires at least
 one day to be selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished">Tout</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished">Audio</translation>
     </message>
 </context>
 <context>
     <name>ClockBase</name>
     <message>
         <source>Clock</source>
         <translation type="unfinished">Horloge</translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stopwatch</source>
         <translation type="unfinished">Chrono</translation>
     </message>
     <message>
         <source>Split</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished">Démarrer</translation>
     </message>
     <message>
         <source>Starts and stops the stopwatch.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lap/Split</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Resets the stopwatch.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check to enable the daily alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the hour the alarm will sound.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the minute the alarm will sound.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished">AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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
@@ -1,871 +1,839 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation>Agenda</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nouveau</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>Aujourd&apos;hui</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Toute la
 journée</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Semaine</translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation>Liste des jours</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mois</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Chercher</translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation>La durée de l&apos;événement est peut-être plus longue
 que l&apos;intervalle entre les répétitions.</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Impossible d&apos;accéder aux données, synchronisation en cours</translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation>Modifier un événement</translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation> minutes)</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Plus de mémoire disponible</translation>
     </message>
     <message>
         <source>Calendar 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
 sauvegarder vos modifications.
 Libérez de l&apos;espace et réessayez.
 
 Quitter tout de même ?</translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation>(indéfini)</translation>
     </message>
     <message>
         <source>Error!</source>
         <translation>Erreur !</translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation>A corriger</translation>
     </message>
     <message>
         <source>Continue</source>
         <translation>Continuer</translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation>Dupliquer l&apos;événement</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>Modifier...</translation>
     </message>
     <message>
         <source>error box</source>
         <translation>boîte d&apos;erreur</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation>L</translation>
     </message>
     <message>
         <source>T</source>
         <translation>M</translation>
     </message>
     <message>
         <source>W</source>
         <translation>M</translation>
     </message>
     <message>
         <source>F</source>
         <translation>V</translation>
     </message>
     <message>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Lundi</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Mardi</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Mercredi</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Jeudi</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Vendredi</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Samedi</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Dimanche</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00p</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation>Début</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Fin</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Modifier</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Emettre</translation>
     </message>
     <message>
         <source>This is an all day event.</source>
         <translation>C&apos;est un événement qui dure toute la journée.</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Horaire</translation>
     </message>
     <message>
         <source> - </source>
         <translation>-</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Dupliquer</translation>
     </message>
     <message>
         <source>Beam this occurence</source>
         <translation>Emettre cette occurence</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation>:00 Après-midi</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation>:00 Matin</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>Après-midi</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>Matin</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Agenda</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>Préférences</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation>Voir les événements</translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation>Heure de début : </translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation>Paramètres des alarmes</translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation>Par défaut</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation> mn</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Autre</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>Style de lignes : </translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Par défaut</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Moyenne</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Grande</translation>
     </message>
     <message>
         <source>Views</source>
         <translation>Vue</translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation>Démarrer 
 dans : </translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Jour</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Semaine</translation>
     </message>
     <message>
         <source>Week List</source>
         <translation>Liste semaine</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mois</translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation>Aller à l&apos;heure courante</translation>
     </message>
     <message>
         <source>Time display</source>
         <translation>Afficher heure</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Aucun</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Début</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation>Début-Fin</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Par défaut</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Lieu :</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Bureau</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Domicile</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Catégorie : </translation>
     </message>
+    <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>
         <translation>s</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Jan-00. Jan</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
         <translation>LMMJVSDL</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstEvent</name>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Modifier</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished">Dupliquer</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Supprimer</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished">Emettre</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>s</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>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>
         <translation>Répéter...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>Quotidienne...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>Hebdomadaire...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>Mensuelle...</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>Annuelle...</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Pas de répétition...</translation>
     </message>
     <message>
         <source>Start Time</source>
         <translation>Heure de
 début</translation>
     </message>
     <message>
         <source>End Time</source>
         <translation>Heure de
 fin</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>Nouvel événement</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Lieu</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Catégorie</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Rendez-vous</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Déjeuner</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Dîner</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Voyage</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Bureau</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Domicile</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>Jan 02 00</translation>
     </message>
     <message>
         <source>Start time</source>
         <translation>Heure
 de début</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Toute la
 journée</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Fuseau
 horaire
 </translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Alarme</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation> mn</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Muette</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Forte</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Répétition</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Pas de répétition...</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Description</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>Début - Fin</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Note...</translation>
     </message>
-    <message>
-        <source>Start Time</source>
-        <translation type="obsolete">Heure de
-début</translation>
-    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Note</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Déjeuner</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Début</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Fin</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Chaque</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>Le %2 %1 chaque </translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>Tous les %1 de chaque </translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>Les %2 %1 de chaque </translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Chaque</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Lundi</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Mardi</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Mercredi</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Jeudi</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Vendredi</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Samedi</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Dimanche</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>,</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>,</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>,</translation>
     </message>
     <message>
         <source>th</source>
         <translation>,</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation>Pas de répétition</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>jour(s)</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>semaine(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Répéter</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Jour</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>mois</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>année(s)</translation>
     </message>
     <message>
         <source>days</source>
         <translation>jours</translation>
     </message>
     <message>
         <source>day</source>
         <translation>jour</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>semaines</translation>
     </message>
     <message>
         <source>week</source>
         <translation>semaine</translation>
     </message>
     <message>
         <source>month</source>
         <translation>mois</translation>
     </message>
     <message>
         <source>year</source>
         <translation>année</translation>
     </message>
     <message>
         <source> and </source>
         <translation> et </translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
 et </translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, et </translation>
     </message>
     <message>
         <source>on </source>
         <translation>Les </translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Repétition</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Aucune</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Jour</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Semaine</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mois</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Année</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Chaque : </translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Fréquence</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Fin le : </translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Pas de date
 de fin</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Répéter le</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Lun</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Mar</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Mer</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Jeu</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Ven</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sam</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Dim</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Chaque </translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Var2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>WeekVar</translation>
     </message>
     <message>
         <source>months</source>
         <translation>mois</translation>
     </message>
     <message>
         <source>years</source>
         <translation>années</translation>
     </message>
 </context>
 </TS>
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,42 +1,32 @@
 <!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>
         <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 annoying...)</source>
         <translation>&lt;b&gt;Voulez-vous activer l&apos;onglet Documents?&lt;/b&gt;&lt;p&gt;
 Notez que 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>
 </context>
 </TS>
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
@@ -1,294 +1,250 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation>Sélection commande</translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation>Editer commandes</translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Commandes de la liste actuelle&lt;/B&gt; : </translation>
     </message>
     <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>
         <source>Tab</source>
         <translation>Tabulation</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Monter</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Descendre</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Coller</translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation>Afficher 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>
         <source>Cyan on White</source>
         <translation>Cyan sur blanc</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>Blanc sur cyan</translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation>Bleu sur noir</translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation>Ambre sur noir</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Couleurs</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>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>
         <source>ScrollBar</source>
         <translation>Barre de défilement</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>Custom</source>
         <translation>Personaliser</translation>
     </message>
     <message>
         <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>
         <source>Hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Pink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pink on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>new session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sessions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To exit fullscreen, tap here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History Lines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konsole </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Sélection commande</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation>Ajouter commande</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation>&lt;B&gt;Entrez commande à ajouter&lt;/B&gt; : </translation>
     </message>
 </context>
 </TS>
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
@@ -1,101 +1,97 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>FifteenConfigDialog</name>
     <message>
         <source>All Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select board background</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FifteenConfigDialogBase</name>
     <message>
         <source>Configure Fifteen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use a Custom Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Path:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Preview:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Grid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Rows:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
 <context>
     <name>PiecesTable</name>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Quinze Pièces</translation>
     </message>
     <message>
         <source>Congratulations!
 You win the game!</source>
         <translation>Bravo !
 Vous avez gagné !</translation>
     </message>
     <message>
         <source>R&amp;andomize Pieces</source>
         <translation>&amp;Mélanger les pièces</translation>
     </message>
     <message>
         <source>&amp;Reset Pieces</source>
         <translation>&amp;Initialiser</translation>
     </message>
 </context>
 </TS>
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
@@ -1,223 +1,183 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>FormatterApp</name>
     <message>
         <source>Formatter</source>
         <translation>Formater</translation>
     </message>
     <message>
         <source>Storage Type</source>
         <translation>Type de média</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <source>Ok</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Formatter Output</source>
         <translation>Sortie du formateur</translation>
     </message>
     <message>
         <source>Trying to umount.</source>
         <translation>Tentative de démontage.</translation>
     </message>
     <message>
         <source>umount failed!</source>
         <translation>Echec du démontage !</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
         <source>Could not umount.
 Device is busy!</source>
         <translation>Impossible de démonter.
 Périphérique occupé !</translation>
     </message>
     <message>
         <source>Trying to format.</source>
         <translation>Tentative de formatage.</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>
         <source>Available: %1 kB ( %d mB)</source>
         <translation>Disponible : %1 ko ( %d Mo)</translation>
     </message>
     <message>
         <source>CAUTION:
 Changing parameters on this
 page may cause your system
 to stop functioning properly!</source>
         <translation>AVERTISSEMENT:
 Changer les paramètres de
 cette page peut rendre votre
 système instable !</translation>
     </message>
     <message>
         <source>Format?</source>
         <translation>Format ?</translation>
     </message>
     <message>
         <source>
 with %1 filesystem?
 You will loose all data!!</source>
         <translation>
 avec système de fichiers %1 ?
 Toutes vos données
 vont être effacées !!</translation>
     </message>
     <message>
         <source>Trying to umount %1.</source>
         <translation>Tentative de démontage de %1.</translation>
     </message>
     <message>
         <source>Trying to mount %1.</source>
         <translation>Tentative de montage de %1.</translation>
     </message>
     <message>
         <source>%1
 has been successfully mounted.</source>
         <translation>%
 a été monté avec succès.</translation>
     </message>
     <message>
         <source>Storage Type: %1</source>
         <translation>Type de média : %1</translation>
     </message>
     <message>
         <source>Type: %1
 Formatted with %2
 %3, %4, %5</source>
         <translation>Type : %1
 Formaté avec %2
 %3, %4, %5</translation>
     </message>
 </context>
 </TS>
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
@@ -1,57 +1,53 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>GoMainWidget</name>
     <message>
         <source>New Game</source>
         <translation>Nouvelle partie</translation>
     </message>
     <message>
         <source>Pass</source>
         <translation>Passer</translation>
     </message>
     <message>
         <source>Resign</source>
         <translation>Abandonner</translation>
     </message>
     <message>
         <source>Two player option</source>
         <translation>Jouer à deux</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Jeu</translation>
     </message>
 </context>
 <context>
     <name>GoWidget</name>
     <message>
         <source>White %1, Black %2. </source>
         <translation>Blanc %1, Noir %2.</translation>
     </message>
     <message>
         <source>White wins.</source>
         <translation>Les blancs l&apos;emportent.</translation>
     </message>
     <message>
         <source>Black wins.</source>
         <translation>Les noires l&apos;emportent.</translation>
     </message>
     <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
@@ -1,42 +1,38 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>HelpBrowser</name>
     <message>
         <source>Backward</source>
         <translation>Retour</translation>
     </message>
     <message>
         <source>Forward</source>
         <translation>Avancer</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Début</translation>
     </message>
     <message>
         <source>Add Bookmark</source>
         <translation>Ajouter aux favoris</translation>
     </message>
     <message>
         <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
@@ -1,77 +1,72 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>KBill</name>
     <message>
         <source>kBill</source>
         <translation>kBill</translation>
     </message>
     <message>
         <source>New game</source>
         <translation>Nouvelle partie</translation>
     </message>
     <message>
         <source>Pause game</source>
         <translation>Pause</translation>
     </message>
     <message>
         <source>Story of kBill</source>
         <translation>L&apos;histoire de kBill</translation>
     </message>
     <message>
         <source>Rules</source>
         <translation>Règles du jeu</translation>
     </message>
     <message>
         <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;
 &lt;LI&gt;Remettez en marche les ordinateurs (un clique)&lt;/LI&gt;
 &lt;LI&gt;Récupérer les OS volés &amp; les replacer sur leur machine d&apos;origine (cliquer-déplacer)&lt;/LI&gt;
 &lt;LI&gt;Apporter des seaux pour éteindre les étincelles (cliquer-déplacer)&lt;/LI&gt;
 &lt;P&gt;Le score évolu en fonction du temps et du bon fonctionnement général du système, avec des bonifications pour le massacre des &quot;Bill&quot;.
 Et pour le reste, vous pourrez certainement trouver de vous même...&lt;/P&gt;</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 disguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</source>
         <translation>&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>
 </context>
 <context>
     <name>UI</name>
     <message>
         <source>After Level</source>
         <translation>Niveau suivant</translation>
     </message>
     <message>
         <source>Your score</source>
         <translation>Votre score</translation>
     </message>
 </context>
 </TS>
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
@@ -1,297 +1,293 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>KRFBConnection</name>
     <message>
         <source>Connected</source>
         <translation>Connecté</translation>
     </message>
     <message>
         <source>Connection Refused</source>
         <translation>Connection refusée</translation>
     </message>
     <message>
         <source>Host not found</source>
         <translation>Hôte introuvable</translation>
     </message>
     <message>
         <source>Read Error: QSocket reported an error reading
 data, the remote host has probably dropped the
 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>
         <source>Protocol Error: An unknown encoding was used by the server %1</source>
         <translation>Erreur de protocole : un encodage inconnu a été utilisé par le serveur %1</translation>
     </message>
     <message>
         <source>Waiting for server initialization...</source>
         <translation>Attente de l&apos;initialisation du serveur...</translation>
     </message>
 </context>
 <context>
     <name>KRFBLogin</name>
     <message>
         <source>Waiting for server version...</source>
         <translation>En attente de la version du serveur...</translation>
     </message>
     <message>
         <source>Error: Invalid server version, %1</source>
         <translation>Erreur : version de serveur non valide, %1</translation>
     </message>
     <message>
         <source>Error: Unsupported server version, %1</source>
         <translation>Erreur : La version du serveur n&apos;est pas supportée, %1</translation>
     </message>
     <message>
         <source>Logged in</source>
         <translation>Connexion établie</translation>
     </message>
     <message>
         <source>Error: This server requires a password, but none has been specified.
 </source>
         <translation>Erreur : Le serveur demande un mot de passe, mais aucun n&apos;a été spécifié.
 </translation>
     </message>
     <message>
         <source>Error: The password you specified was incorrect.</source>
         <translation>Erreur : Le mot de passe fourni n&apos;est pas correct.</translation>
     </message>
     <message>
         <source>Error: Too many invalid login attempts have been made
 to this account, please try later.</source>
         <translation>Erreur : Trop de tentatives de connexion infructueuses ont été faites
 sous ce compte, essayez plus tard.</translation>
     </message>
     <message>
         <source>Login Failed</source>
         <translation>Echec de connexion</translation>
     </message>
     <message>
         <source>Too many failures</source>
         <translation>Trop d&apos;échecs</translation>
     </message>
 </context>
 <context>
     <name>KVNC</name>
     <message>
         <source>VNC Viewer</source>
         <translation>Client VNC</translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation>Plein écran</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>Déconnecté</translation>
     </message>
     <message>
         <source>Stop Full Screen</source>
         <translation>Quitter le mode &quot;plein écran&quot;</translation>
     </message>
     <message>
         <source>Connected to remote host</source>
         <translation>Connecté à l&apos;hôte distant</translation>
     </message>
     <message>
         <source>Logged in to remote host</source>
         <translation>Connecté sur l&apos;hôte distant</translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation>Connexion terminée</translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation>Nouvelle connexion</translation>
     </message>
     <message>
         <source>Open Bookmark</source>
         <translation>Ouvrir favori</translation>
     </message>
     <message>
         <source>Delete Bookmark</source>
         <translation>Supprimer favori</translation>
     </message>
     <message>
         <source>Send Contrl-Alt-Delete</source>
         <translation>Envoyer Contrl+Alt+Suppr</translation>
     </message>
     <message>
         <source>Next Click is Double Click</source>
         <translation>Le clic suivant est un double clic</translation>
     </message>
     <message>
         <source>Next Click is Right Click</source>
         <translation>Le clic suivant est un clic droit</translation>
     </message>
 </context>
 <context>
     <name>KVNCBookmarkDlgBase</name>
     <message>
         <source>Bookmarks</source>
         <translation>Favoris</translation>
     </message>
     <message>
         <source>Choose a bookmark that you would like to open</source>
         <translation>Choisissez le favori que vous désirez ouvrir</translation>
     </message>
 </context>
 <context>
     <name>KVNCConnDlgBase</name>
     <message>
         <source>VNC Viewer Connection</source>
         <translation>Connexion VNC</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Serveur</translation>
     </message>
     <message>
         <source>Show Password</source>
         <translation>Montrer mot de passe</translation>
     </message>
     <message>
         <source>Password:</source>
         <translation>Mot de passe : </translation>
     </message>
     <message>
         <source>Bookmark Name:</source>
         <translation>Nom du favori : </translation>
     </message>
     <message>
         <source>Host Name:</source>
         <translation>Nom d&apos;hôte : </translation>
     </message>
     <message>
         <source>Display Number:</source>
         <translation>Numéro écran : </translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Options</translation>
     </message>
     <message>
         <source>Check for screen updates every:</source>
         <translation>Vérifier mise à jour écran toutes les : </translation>
     </message>
     <message>
         <source>Milliseconds</source>
         <translation>Millisecondes</translation>
     </message>
     <message>
         <source>Request 8-bit session</source>
         <translation>Demande de session &quot;8 bits&quot;</translation>
     </message>
     <message>
         <source>Raise on bell</source>
         <translation>Réveil à la cloche</translation>
     </message>
     <message>
         <source>Request shared session</source>
         <translation>Demande de session partagée</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>Scale Factor</source>
         <translation>Facteur d&apos;échelle</translation>
     </message>
     <message>
         <source>Encodings</source>
         <translation>Encodages</translation>
     </message>
     <message>
         <source>Hextile encoding</source>
         <translation>Encodage Hextile</translation>
     </message>
     <message>
         <source>CoRRE encoding</source>
         <translation>Encodage CoRRE</translation>
     </message>
     <message>
         <source>RRE encoding</source>
         <translation>Encodage RRE</translation>
     </message>
     <message>
         <source>Copy rectangle encoding</source>
         <translation>Encodage Copie de rectangle</translation>
     </message>
     <message>
         <source>The password of the VNC server</source>
         <translation>Le mot de passe du serveur VNC</translation>
     </message>
     <message>
         <source>Toggle obscuring the password</source>
         <translation>Cacher le mot de passe</translation>
     </message>
     <message>
         <source>The name of the VNC server</source>
         <translation>Le nom du serveur VNC</translation>
     </message>
     <message>
         <source>The host name of the VNC server</source>
         <translation>Le nom d&apos;hôte du serveur VNC</translation>
     </message>
     <message>
         <source>The display number of the VNC server</source>
         <translation>Le numéro d&apos;écran du serveur VNC</translation>
     </message>
     <message>
         <source>Delay between requesting updates from the server</source>
         <translation>Délai entre les requêtes de mise à jour du serveur</translation>
     </message>
     <message>
         <source>Request that the VNC server transfer 8 bit color</source>
         <translation>Demande au serveur d&apos;utiliser les couleurs sur 8-bit </translation>
     </message>
     <message>
         <source>Allow other users to connect to the VNC server</source>
         <translation>Autorise les autres utilisateurs à se connecter au serveur VNC</translation>
     </message>
     <message>
         <source>Scale the remote display to fit on the PDA (Slow)</source>
         <translation>Modifier la taille de l&apos;écran distant pour l&apos;ajuster à celle du PDA (lent)</translation>
     </message>
     <message>
         <source>Enable transmiting identical rectangles as references to existing data</source>
         <translation>Activer la transmission de rectangles identiques comme référence aux données existantes</translation>
     </message>
 </context>
 </TS>
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
@@ -1,260 +1,250 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Keys</name>
     <message>
         <source>Ok</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Réglages par défaut</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
         <source>Change Direction Keys</source>
         <translation>Modifier touches de direction</translation>
     </message>
     <message>
         <source>Undefined key</source>
         <translation>Touche non définie</translation>
     </message>
 </context>
 <context>
     <name>Kpacman</name>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Nouveau</translation>
     </message>
     <message>
         <source>&amp;Pause</source>
         <translation>&amp;Pause</translation>
     </message>
     <message>
         <source>&amp;Hall of fame</source>
         <translation>&amp;Meilleurs scores</translation>
     </message>
     <message>
         <source>&amp;Quit</source>
         <translation>&amp;Quitter</translation>
     </message>
     <message>
         <source>&amp;Hide Mousecursor</source>
         <translation>&amp;Cacher curseur souris</translation>
     </message>
     <message>
         <source>&amp;Select graphic scheme</source>
         <translation>&amp;Selectionner thème graphique</translation>
     </message>
     <message>
         <source>&amp;Pause in Background</source>
         <translation>Pause en tâche de &amp;Fond</translation>
     </message>
     <message>
         <source>&amp;Continue in Foreground</source>
         <translation>Continuer en tâche &amp;Active</translation>
     </message>
     <message>
         <source>Change &amp;keys...</source>
         <translation>Changer les &amp;Touches...</translation>
     </message>
     <message>
         <source>@PACKAGE@ - @VERSION@
 
 Joerg Thoennissen (joe@dsite.de)
 
 A pacman game for the KDE Desktop
 
 The program based on the source of ksnake
 by Michel Filippi (mfilippi@sade.rhein-main.de).
 The design was strongly influenced by the pacman
 (c) 1980 MIDWAY MFG.CO.
 
 I like to thank my girlfriend Elke Krueers for
 the last 10 years of her friendship.
 </source>
         <translation>@PACKAGE@ - @VERSION@
 
 Joerg Thoennissen (joe@dsite.de)
 
 Un jeu de pacman pour le bureau KDE 
 
 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.
 
 Le fichier &apos;@FONTNAME@&apos; n&apos;existe pas,
 ou est dans un format inconnu.</translation>
     </message>
 </context>
 <context>
     <name>Referee</name>
     <message>
         <source>GAME  OVER</source>
         <translation>JEU TERMINE</translation>
     </message>
     <message>
         <source>PLAYER ONE</source>
         <translation>JOUEUR UN</translation>
     </message>
     <message>
         <source>READY!</source>
         <translation>PRET !</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>EN PAUSE</translation>
     </message>
     <message>
         <source>CHARACTER</source>
         <translation>PERSONNAGE</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>NICKNAME</source>
         <translation>SURNOM</translation>
     </message>
     <message>
         <source>-SHADOW</source>
         <translation>-SHADOW</translation>
     </message>
     <message>
         <source>&quot;BLINKY&quot;</source>
         <translation>&quot;BLINKY&quot;</translation>
     </message>
     <message>
         <source>-SPEEDY</source>
         <translation>-SPEEDY</translation>
     </message>
     <message>
         <source>&quot;PINKY&quot;</source>
         <translation>&quot;PINKY&quot;</translation>
     </message>
     <message>
         <source>-BASHFUL</source>
         <translation>-BASHFUL</translation>
     </message>
     <message>
         <source>&quot;INKY&quot;</source>
         <translation>&quot;INKY&quot;</translation>
     </message>
     <message>
         <source>-POKEY</source>
         <translation>-POKEY</translation>
     </message>
     <message>
         <source>&quot;CLYDE&quot;</source>
         <translation>&quot;CLYDE&quot;</translation>
     </message>
     <message>
         <source>QTOPIA PORT: CATALIN CLIMOV</source>
         <translation>PORTAGE QTOPIA: CATALIN CLIMOV</translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
         <translation>TOUCHE DE DIRECTION DEMARRER</translation>
     </message>
 </context>
 <context>
     <name>Score</name>
     <message>
         <source>  1UP </source>
         <translation>1UP</translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
         <translation>MEILLEUR SCORE</translation>
     </message>
     <message>
         <source>  2UP </source>
         <translation>2UP</translation>
     </message>
     <message>
         <source>     CONGRATULATIONS      </source>
         <translation>FELICITATIONS</translation>
     </message>
     <message>
         <source>    YOU HAVE ARCHIEVED    </source>
         <translation>VOUS AVEZ REUSSIT</translation>
     </message>
     <message>
         <source>  A SCORE IN THE TOP 10.  </source>
         <translation>UN SCORE DANS LE TOP 10.</translation>
     </message>
     <message>
         <source>RNK   SCORE  NAME   DATE</source>
         <translation>RNK SCORE NOM DATE</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>EN PAUSE</translation>
     </message>
     <message>
         <source>@YY@/@MM@/@DD@</source>
         <translation>@YY@/@MM@/@DD@</translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>                          </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Status</name>
     <message>
         <source>The pixmap could not be contructed.
 
 The file &apos;@PIXMAPNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation>L&apos;image ne peut-être construite.
 
 Le fichier &apos;@PIXMAPNAME@&apos; n&apos;existe pas,
 ou est dans un format inconnu.</translation>
     </message>
     <message>
         <source>Initialization Error</source>
         <translation>Erreur d&apos;initialisation</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/launchersettings.ts b/i18n/fr/launchersettings.ts
index 7a8c9d0..c5b4903 100644
--- a/i18n/fr/launchersettings.ts
+++ b/i18n/fr/launchersettings.ts
@@ -1,306 +1,279 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>DocTabSettings</name>
     <message>
         <source>Enable the Documents Tab</source>
         <translation>Activer l&apos;onglet Documents</translation>
     </message>
     <message>
         <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
         <translation>&lt;b&gt;Note :&lt;/b&gt; Modifier ce paramètre peut nécessiter le redémarrage d&apos;Opie pour qu&apos;il preinne effet.</translation>
     </message>
     <message>
         <source>Check, if you want the Documents Tab to be visible.</source>
         <translation>Cochez cette option si vous désirez voir un onglet Documents.</translation>
     </message>
 </context>
 <context>
     <name>InputMethodSettings</name>
     <message>
         <source>Resize application on Popup</source>
         <translation>Redimensionner les applications à l&apos;ouverture</translation>
     </message>
     <message>
         <source>Enable floating and resizing</source>
         <translation>Activer redimension et déplacement</translation>
     </message>
     <message>
         <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
         <translation>&lt;b&gt;Note :&lt;/b&gt; Modifier ce paramêtre peut nécessiter le redémarrage d&apos;Opie pour qu&apos;il preinne effet.</translation>
     </message>
     <message>
         <source>Check, if you want the application to be automatically resized if the input method pops up.</source>
         <translation>Cochez si vous désirez que la fenêtre des applications soit automatiquement redimensionnées pour les méthodes d&apos;entrée.</translation>
     </message>
     <message>
         <source>Check, if you want to move and/or resize input methods</source>
         <translation>Cochez si vous désirez pouvoir déplacer ou redimensionner les fenêtres des méthodes d&apos;entrées</translation>
     </message>
     <message>
         <source>Specify the percentage of the screen width for the input method</source>
         <translation>Pourcentage de l&apos;écran devant être utilisé par les méthodes d&apos;entrée</translation>
     </message>
 </context>
 <context>
     <name>LauncherSettings</name>
     <message>
         <source>Launcher Settings</source>
         <translation>Paramètres du bureau</translation>
     </message>
     <message>
         <source>Taskbar</source>
         <translation>Barre des tâches</translation>
     </message>
     <message>
         <source>O-Menu</source>
         <translation>Menu O</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Onglets</translation>
     </message>
     <message>
         <source>InputMethods</source>
         <translation>Méthodes d&apos;entrée</translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation>Onglet Document</translation>
     </message>
 </context>
 <context>
     <name>MenuSettings</name>
     <message>
         <source>Load applets in O-Menu:</source>
         <translation>Afficher ces icônes dans le menu O : </translation>
     </message>
     <message>
         <source>Show Launcher tabs in O-Menu</source>
         <translation>Afficher les onglets dans le menu O</translation>
     </message>
     <message>
         <source>Check the applets that you want to have included in the O-Menu.</source>
         <translation>Choisissez les icônes à afficher dans le menu O.</translation>
     </message>
     <message>
         <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
         <translation>Permet d&apos;afficher le contenu des onglets du bureau dans le menu O.</translation>
     </message>
     <message>
-        <source>Show Applications in subpopups</source>
-        <translation type="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>
     </message>
     <message>
         <source>Icons</source>
         <translation>Icônes</translation>
     </message>
     <message>
         <source>Previewing %1</source>
         <translation>Prévisualisation %1</translation>
     </message>
     <message>
         <source>This is a rough preview of what the currently selected Tab will look like.</source>
         <translation>Ceci est une prévisualisation grossière de l&apos;apparence qu&apos;aura l&apos;onglet sélectionné.</translation>
     </message>
     <message>
         <source>Use a custom font</source>
         <translation>Personnaliser la police</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Type : </translation>
     </message>
     <message>
         <source>Ruled</source>
         <translation>Strié</translation>
     </message>
     <message>
         <source>Solid color</source>
         <translation>Couleur unie</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Image</translation>
     </message>
     <message>
         <source>Select...</source>
         <translation>Parcourir...</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Réglages par défaut</translation>
     </message>
     <message>
         <source>Size:</source>
         <translation>Taille : </translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Petite</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Grande</translation>
     </message>
     <message>
         <source>Color:</source>
         <translation>Couleur : </translation>
     </message>
     <message>
         <source>Columns:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatic</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TabsSettings</name>
     <message>
         <source>Launcher Tabs:</source>
         <translation>Onglets du bureau : </translation>
     </message>
     <message>
         <source>foobar</source>
         <translation>foobar</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nouveau</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editer</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Effacer</translation>
     </message>
     <message>
         <source>Enable big busy indicator</source>
         <translation>Afficher le sablier élargi</translation>
     </message>
     <message>
-        <source>Enable blinking busy indicator</source>
-        <translation 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>
         <source>Not implemented yet</source>
         <translation>Pas encore implanté</translation>
     </message>
     <message>
         <source>Enable animated busy indicator</source>
         <translation>Activer l&apos;indicateur d&apos;état &apos;occupé&apos;</translation>
     </message>
     <message>
         <source>Activate this, if you want an animatedbusy indicator for starting applications in the Launcher.</source>
         <translation>Cocher cette option si vous désirez afficher un indicateur animé lors du lancement des applications.</translation>
     </message>
     <message>
         <source>Enable static background pixmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Activate this, if you want the background pixmap not to scroll with the icons.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskbarSettings</name>
     <message>
         <source>Load applets in Taskbar:</source>
         <translation>Afficher ces icônes dans la barre des tâches : </translation>
     </message>
     <message>
         <source>Check the applets that you want displayed in the Taskbar.</source>
         <translation>Choisissez les icônes à afficher dans la barre des tâches.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/libbatteryapplet.ts b/i18n/fr/libbatteryapplet.ts
index 1bcacc3..ec99565 100644
--- a/i18n/fr/libbatteryapplet.ts
+++ b/i18n/fr/libbatteryapplet.ts
@@ -1,115 +1,87 @@
 <!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>
         <source>Very Low</source>
         <translation>Très faible</translation>
     </message>
     <message>
         <source>Critical</source>
         <translation>Critique</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Inconnu</translation>
     </message>
     <message>
         <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>
         <source>Remaing Power: %1 %2
 Remaining Time: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ipaq  %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,170 +1,166 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Utilisation CPU par les applications (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>Utilisation système du CPU (%)</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Cette page affiche le niveau d&apos;utilisation du processeur de votre appareil.</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 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 vous montre l&apos;utilisation de la mémoire de votre PDA.
 La mémoire (i.e RAM) 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>Total Memory: %1 kB</source>
         <translation>Mémoire totale : %1 Ko</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Utilisée (%1 Ko)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Buffers (%1 Ko)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Cache (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Libre (%1 kB)</translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation>Echange totale :  %1 kB</translation>
     </message>
 </context>
 <context>
     <name>MemoryStatus</name>
     <message>
         <source>Memory Status</source>
         <translation>Status mémoire</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Mémoire</translation>
     </message>
     <message>
         <source>Swapfile</source>
         <translation>Fichier d&apos;échange</translation>
     </message>
     <message>
         <source>&lt;center&gt;&lt;b&gt;Memory Monitor Plugin&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Based on source code from:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;This program is licensed under GNU GPL.&lt;/center&gt;</source>
         <translation>&lt;center&gt;&lt;b&gt;Plugin Info Mémoire&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Code source basé sur :&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Applet Batterie (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;Ce programme est sous licence GNU GPL.&lt;/center&gt;</translation>
     </message>
     <message>
         <source>About</source>
         <translation>A propos</translation>
     </message>
 </context>
 <context>
     <name>Swapfile</name>
     <message>
         <source>Swapfile location</source>
         <translation>Chemin du fichier d&apos;échange</translation>
     </message>
     <message>
         <source>RAM</source>
         <translation>RAM</translation>
     </message>
     <message>
         <source>CF Card</source>
         <translation>Carte CF</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>Carte SD</translation>
     </message>
     <message>
         <source> On </source>
         <translation>Activé</translation>
     </message>
     <message>
         <source> Off </source>
         <translation>Désactivé</translation>
     </message>
     <message>
         <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>
         <source>Failed to initialize swapfile.</source>
         <translation>Echec d&apos;initialisation du fichier d&apos;échange.</translation>
     </message>
     <message>
         <source>Swapfile created.</source>
         <translation>Fichier d&apos;échange créé.</translation>
     </message>
     <message>
         <source>Failed to remove swapfile.</source>
         <translation>Echec de suppression du fichier d&apos;échange.</translation>
     </message>
     <message>
         <source>Swapfile removed.</source>
         <translation>Fichier d&apos;échange supprimé.</translation>
     </message>
     <message>
         <source>Swapfile activated.</source>
         <translation>Fichier d&apos;échange activé.</translation>
     </message>
     <message>
         <source></source>
         <translation></translation>
     </message>
     <message>
         <source>2 Mb,4 Mb,6 Mb,8 Mb,16 Mb,32 Mb,64 Mb</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,100 +1,96 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation>Bouton Calendrier</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation>Bouton Contacts</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation>Bouton Menu</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation>Bouton Message</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation>Bouton Bureau</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation>Bouton Enregistrement</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation>Haut</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation>Bas</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation>Droite</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation>Gauche</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation>Maj + Haut</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation>Maj + Bas</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation>Maj + Droite</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation>Maj + Gauche</translation>
     </message>
     <message>
-        <source>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>
         <source>Todo Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge3</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Trash</source>
         <translation>Poubelle</translation>
     </message>
 </context>
 </TS>
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,199 +1,77 @@
 <!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>
     </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>&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>OpieObex::SendWidget</name>
     <message>
         <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;h1&gt;Emission :&lt;/h1&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Done</source>
         <translation>Terminé</translation>
     </message>
     <message>
         <source>IrDa is not enabled!</source>
         <translation>IrDa non activé !</translation>
     </message>
     <message>
         <source>Searching for IrDa Devices.</source>
         <translation>Recherche des dispositifs IrDa.</translation>
     </message>
     <message>
         <source>Bluetooth is not available</source>
         <translation>Bluetooth n&apos;est pas disponible</translation>
     </message>
     <message>
         <source>Searching for bluetooth Devices.</source>
         <translation>Recherche des dispositifs bluetooth.</translation>
     </message>
     <message>
         <source>Scheduling for beam.</source>
         <translation>Préparation de l&apos;envoi.</translation>
     </message>
     <message>
         <source>Click to beam</source>
         <translation>Cliquez pour envoyer</translation>
     </message>
     <message>
         <source>Sent</source>
         <translation>Envoyé</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Echec</translation>
     </message>
     <message>
         <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,1177 +1,730 @@
 <!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>
     </message>
     <message>
         <source>Week</source>
         <translation>Semaine</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mois</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Année</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Chaque : </translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Fréquence</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Fin : </translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Pas de date de fin</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Répéter</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Lu</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Ma</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Me</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Je</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Ve</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sa</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Di</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Chaque </translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>WeekVar</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceWidget</name>
     <message>
         <source>No End Date</source>
         <translation>Pas de date de fin</translation>
     </message>
     <message>
         <source>days</source>
         <translation>jours</translation>
     </message>
     <message>
         <source>day</source>
         <translation>jour</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>semaines</translation>
     </message>
     <message>
         <source>week</source>
         <translation>semaine</translation>
     </message>
     <message>
         <source>months</source>
         <translation>mois</translation>
     </message>
     <message>
         <source>month</source>
         <translation>mois</translation>
     </message>
     <message>
         <source>years</source>
         <translation>années</translation>
     </message>
     <message>
         <source>year</source>
         <translation>année</translation>
     </message>
     <message>
         <source> and </source>
         <translation> et </translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
 et </translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, et </translation>
     </message>
     <message>
         <source>on </source>
         <translation>Les </translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation>Pas de répétition</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>jour(s)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Répéter</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Lu</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Ma</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Me</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Je</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Ve</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sa</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Di</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>semaine(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Type répétition</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Jour</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>mois</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>année(s)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Chaque </translation>
     </message>
 </context>
 <context>
-    <name>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>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to edit the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to duplicate the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to delete the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to transmit the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</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">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>
         <source>High</source>
         <translation>Haute</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normale</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Faible</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation>Très faible</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Etat : </translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Délai : </translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Catégorie : </translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation>E-mail par défaut : </translation>
     </message>
     <message>
-        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
-        <translation 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>
         <source>Home Mobile: </source>
         <translation>Mobile (perso.):</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation>E-mail(s) : </translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Profession : </translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Assistant(e) : </translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Responsable : </translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Homme</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Femme</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Type : </translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Conjoint : </translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Date de naissance : </translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Anniversaire : </translation>
     </message>
     <message>
         <source>Children: </source>
         <translation>Enfant(s) : </translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Surnom : </translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Lieu : </translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation>Cet événement couvre
 toute la journée</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation>Cet événement couvre
 plusieurs jours</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation>Début : </translation>
     </message>
     <message>
         <source>End:</source>
         <translation>Fin : </translation>
     </message>
     <message>
         <source>Note:</source>
         <translation>Note : </translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Chaque </translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 chaque</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>Le %1 chaque</translation>
     </message>
     <message>
         <source>The %1 %2 of every</source>
         <translation>Le %2 %1 chaque </translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Chaque</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Lundi</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Mardi</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Mercredi</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Jeudi</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Vendredi</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Samedi</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Dimanche</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Description : </translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&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>&lt;br&gt;&lt;b&gt;Adresse (dom.): &lt;/b&gt;</translation>
     </message>
     <message>
         <source>User Id</source>
         <translation>Id utilisateur</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>Catégories</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Titre</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Prénom</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>2nd Prénom</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Nom</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Suffixe</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Classer sous</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Fonction</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Département</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Société</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Téléphone (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>Default Email</source>
         <translation>E-mail (défaut)</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>E-mails</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Téléphone (dom.)</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Fax (dom.)</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Mobile (perso.)</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Adresse (bur.)</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Ville (bur.)</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>Département (bur.)</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>Code Postal (bur.)</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>Pays (bur.)</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Alphapage (bur.)</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Page Web (bur.)</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Bureau</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Profession</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Assistant(e)</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Responsable</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Adresse (dom.)</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Ville (dom.)</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>Département (dom.)</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>Code Postal (dom.)</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>Pays (dom.)</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Page Web (perso.)</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Conjoint</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Sexe</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Date de naissance</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Anniversaire</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Surnom</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Enfant</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notes</translation>
     </message>
     <message>
         <source>Has a due-date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No due-date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No reccurrence</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No start-date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No completed-date</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>,</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>,</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>,</translation>
     </message>
     <message>
         <source>th</source>
         <translation>,</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/libopieui2.ts b/i18n/fr/libopieui2.ts
index e43f2a2..19ffe11 100644
--- a/i18n/fr/libopieui2.ts
+++ b/i18n/fr/libopieui2.ts
@@ -1,1087 +1,176 @@
 <!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>
     </message>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation>OTimePickerDialogBase</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished">Nom</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished">Taille</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Date</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished">Type mime</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished">Sélection fichier</translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished">Ouvrir</translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished">Enregistrer</translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation>Nom : </translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation type="unfinished">Style</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished">Taille</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished">Le renard brun saute au dessus du chien paresseux</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="unfinished">Dessin</translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="unfinished">Nom</translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished">Touche</translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished">Touche par défaut</translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished">Raccourci pour l&apos;action séléctionnée</translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished">&amp;Aucun</translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished">&amp;Défaut</translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished">&amp;Personnalisé</translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished">Défaut : </translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished">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="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
@@ -1,1070 +1,1001 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation>Toute</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Non classée</translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation> (multi.)</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Professionelle</translation>
     </message>
     <message>
         <source>Personal</source>
         <translation>Personnelle</translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation> (Multi.)</translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation>Tout</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>Nouvelle catégorie</translation>
     </message>
     <message>
         <source>New Category </source>
         <translation>Nouvelle catégorie</translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation>Edition des catégories</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>Catégories</translation>
     </message>
     <message>
         <source>Application</source>
         <translation>Application</translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation>Les catégories vont ici</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Ajouter</translation>
     </message>
     <message>
         <source>Global</source>
         <translation>Globale</translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation>Cochez les catégories auquelles ce document appartient.</translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation>Entrez une nouvelle catégorie ici. Pressez &lt;b&gt;Ajouter&lt;/b&gt; pour l&apos;ajouter à la liste.</translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation>Entrez une nouvelle catégorie à gauche et pressez pour l&apos;ajouter à la liste.</translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation>Cliquez pour effacer la catégorie surlignée.</translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation>Cochez pour rendre cette propriété disponible aux autres applications.</translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation>Tout</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Vide</translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation>Désolé, une autre application
 est en train d&apos;éditer les catégories.</translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation>Editer catégories</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tout</translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation>Afficher Janvier dans l&apos;année
 sélectionnée</translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation>Afficher le mois précédent</translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation>Afficher le mois suivant</translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation>Afficher Décembre dans l&apos;année
 sélectionnée</translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation>Fermer le sélecteur de fichiers</translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation>Afficher les documents de ce type</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Vue &quot;Document&quot;</translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation>Afficher les documents
 dans cette catégorie</translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation>Cliquez pour sélectionner un document
 de cette liste</translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation>, ou sélectionnez &lt;b&gt;Nouveau Document&lt;/b&gt;&lt;br&gt;pour créer un nouveau document.</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation>&lt;br&gt;&lt;br&gt;Cliquez et restez appuyé pour accéder&lt;br&gt;aux propriétés du document.</translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <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>
         <source>Find what:</source>
         <translation>Rechercher : </translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Catégorie : </translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation>Débuter la recherche à : </translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation>01 Dec 02</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Respecter la casse</translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation>Recherche en sens inverse</translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Document View</source>
         <translation>Vue Document</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation>Echec suppression fichier.</translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation>Copie de</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Dupliquer</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>Echec copie fichier.</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Détails</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>Echec déplacement fichier.</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Disque dur</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Propriétés</translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation>Détails</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>Infos : </translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Type : </translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nom : </translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Emplacement : </translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation>Chargement rapide
 (consomme de la mémoire)</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copier</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Emettre</translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation>Le média sur lequel le document est placé.</translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation>Le nom du document.</translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation>Pré-charger cette application pour qu&apos;elle soit disponible instantanément.</translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation>Supprimer ce document.</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation>Faire une copie de ce document.</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation>Transmettre ce document à un autre dispositif.</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation>Personnaliser la rotation</translation>
     </message>
     <message>
         <source>Arguments:</source>
         <translation>Arguments : </translation>
     </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>Information propriétaire</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Entrez mot de passe</translation>
     </message>
 </context>
 <context>
     <name>QMessageBox</name>
     <message>
         <source>Yes</source>
         <translation>Oui</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Non</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Plus de mémoire</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>Un problème est survenu lors de
 la création des informations de
 configuration du programme.
 
 Veuillez libérer de la mémoire et 
 ré-essayez.</translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 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>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Adresse (Dom.)&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation>Adresses e-mails : </translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Tél (dom): </translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Fax (dom): </translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Mobile (perso.): </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Page Web (perso.): </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Page Web (bur.): </translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Service : </translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Téléphone (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>Profession: </source>
         <translation>Profession : </translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Assistant(e): </translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Responsable : </translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Homme</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Femme</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Type : </translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Conjoint : </translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Date de naissance: </translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Anniversaire : </translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Surnom : </translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Titre</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Prénom</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>2nd Prénom</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Nom</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Suffixe</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Fichier sous</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Fonction</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Département</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Société</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Téléphone (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>Default Email</source>
         <translation>E-mail par défaut</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>E-mails</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Tél (dom.)</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Fax (dom.)</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Mobile (dom.)</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Adresse (bur.)</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Ville (bur.)</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>Département (bur.)</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>Code Postal (bur.)</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>Pays (bur.)</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Alphapage (bur.)</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Page Web (bur.)</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Service</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Profession</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Assistant(e)</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Responsable</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Rue (dom.)</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Ville (dom.)</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>Etat (dom.)</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>Code Postal (dom.)</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>Pays (dom.)</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Page Web (dom.)</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Conjoint</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Date de naissance</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Anniversaire</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Surnom</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Enfant(s)</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notes</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Groupes</translation>
     </message>
     <message>
         <source>New Document</source>
         <translation>Nouveau document</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Lu</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Ma</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Me</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Je</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Ve</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sa</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Di</translation>
     </message>
     <message>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
         <source>Feb</source>
         <translation>Fev</translation>
     </message>
     <message>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
         <source>Apr</source>
         <translation>Avr</translation>
     </message>
     <message>
         <source>May</source>
         <translation>Mai</translation>
     </message>
     <message>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
         <source>Aug</source>
         <translation>Aoû</translation>
     </message>
     <message>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
         <source>Oct</source>
         <translation>Oct</translation>
     </message>
     <message>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
         <source>Dec</source>
         <translation>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>
         <source>Move</source>
         <translation>Déplacer</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Taille</translation>
     </message>
     <message>
         <source>Maximize</source>
         <translation>Maximiser</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Fermer</translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>Carte CF</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Disque dur</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>Carte SD</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>Disque dur SCSI</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Disque interne</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>Mémoire interne</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>Carte MMC</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>Aucun</translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation>Impossible de trouver l&apos;exécutable
 &quot;Heure de Ville&quot;</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation>Pour choisir le fuseau horaire,
 installez &quot;Heure de Ville&quot; SVP.</translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Plus de mémoire</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Programmation alarme impossible.
 Libérez de la mémoire et réessayez</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>%1 fichiers</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>%1 %2</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>Tous fichiers %1</translation>
     </message>
     <message>
         <source>All files</source>
         <translation>Tous les fichiers</translation>
     </message>
 </context>
 <context>
     <name>WindowDecoration</name>
     <message>
         <source>Default</source>
         <comment>List box text for default window decoration</comment>
         <translation>Défaut</translation>
     </message>
 </context>
 </TS>
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
@@ -1,119 +1,107 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AddressBookPluginConfig</name>
     <message>
         <source>Max Lines: </source>
         <translation>Lignes max:</translation>
     </message>
     <message>
         <source>Set the maximum number of lines that should be shown for each anniversaries/birthdays</source>
         <translation>Définit le maximum de ligne qui devront être affichées pour chaque Date de naissance/Anniversaire</translation>
     </message>
     <message>
-        <source>Clip line after X chars: </source>
-        <translation 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>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation>Cette couleur sera utilisée pour afficher les dates de Naissances/Anniversaire !</translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation>Défini couleur
 d&apos;urgence</translation>
     </message>
     <message>
         <source> days: </source>
         <translation>
 jours</translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation>Couleur utilisé si l&apos;événement est proche !</translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation>La couleur d&apos;urgence est utilisée si les dates sont plus proches que le nombre défini de jours !</translation>
     </message>
     <message>
         <source>Enable/Disable Views</source>
         <translation>Activer/Désactiver les Vues</translation>
     </message>
     <message>
         <source>Show &amp;Birthdays</source>
         <translation>Afficher &amp;date de naissance</translation>
     </message>
     <message>
         <source>Show &amp;Anniveraries</source>
         <translation>Afficher &amp;anniversaires</translation>
     </message>
     <message>
         <source>The next birthdays will just be shown, if enabled!</source>
         <translation>Les prochains anniversaires de date de naissance seront affichés si l&apos;option est activé!</translation>
     </message>
     <message>
         <source>The next anniversaries will just be shown, if enabled !</source>
         <translation>Les prochains anniversaires seront affichés si activé!</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>AddressBook plugin</source>
         <translation>Module &quot;Contacts&quot;</translation>
     </message>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>Prochain anniversaire de naissance
 prévu dans &lt;b&gt;%1&lt;/b&gt; jour(s):</translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>Pas d&apos;anniversaire de naissance prévu
 dans les &lt;b&gt;%1&lt;/b&gt; prochains jours !</translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>Prochain anniversaire dans &lt;b&gt;%1&lt;/b&gt; jour(s):</translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>Pas d&apos;anniversaire dans les &lt;b&gt;%1&lt;/b&gt;
 prochains jours !</translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation>La base de données ne permet pas ce type de recherche ! Mettez à jour libOpie !&lt;br&gt;</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/libtodaydatebookplugin.ts b/i18n/fr/libtodaydatebookplugin.ts
index 3500627..03905c5 100644
--- a/i18n/fr/libtodaydatebookplugin.ts
+++ b/i18n/fr/libtodaydatebookplugin.ts
@@ -1,146 +1,88 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <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>
     </message>
     <message>
         <source>Show notes</source>
         <translation>Afficher les notes</translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
         <translation>Pour afficher les notes liées aux évènements</translation>
     </message>
     <message>
         <source>Show only later appointments</source>
         <translation>Afficher les événements seulement</translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
         <translation>Pour n&apos;afficher que les événements à venir</translation>
     </message>
     <message>
         <source>Show time in extra line</source>
         <translation>Afficher l&apos;heure sur une nouvelle ligne</translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
         <translation>Nombre maximum d&apos;événements à afficher (par ordre chronologique)</translation>
     </message>
     <message>
         <source>How many appointment should be shown?</source>
         <translation>Nombre d&apos;événements à afficher ?</translation>
     </message>
     <message>
         <source>only today</source>
         <translation>seulement aujourd&apos;hui</translation>
     </message>
     <message>
         <source>How many more days should be in the range</source>
         <translation>Nombre de jours total à afficher</translation>
     </message>
     <message>
         <source>How many more days</source>
         <translation>Nombre de jours</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Datebook plugin</source>
         <translation>Module Agenda</translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation>Aucun événement prévu</translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation>Pas d&apos;événement aujourd&apos;hui</translation>
     </message>
 </context>
 </TS>
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
@@ -1,61 +1,41 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>QObject</name>
     <message>
         <source>Todolist plugin</source>
         <translation>Module &quot;Tâches&quot;</translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation>Vous avez &lt;b&gt; 1&lt;/b&gt; tâche active :&lt;br&gt;</translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation>Vous avez &lt;b&gt; %1&lt;/b&gt; tâches actives : &lt;br&gt;</translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation>Pas de tâche active</translation>
     </message>
 </context>
 <context>
     <name>TodoPluginConfigBase</name>
     <message>
         <source>Set the maximum number of task that should be shown</source>
         <translation>Définit le nombre maximum de tâches à afficher</translation>
     </message>
     <message>
         <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
@@ -1,121 +1,117 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>QObject</name>
     <message>
         <source>Weather plugin</source>
         <translation>Module &quot;Météo&quot;</translation>
     </message>
 </context>
 <context>
     <name>WeatherPluginConfig</name>
     <message>
         <source>Enter ICAO location identifier:</source>
         <translation>Entrez l&apos;indentificateur de lieu ICAO : </translation>
     </message>
     <message>
         <source>Enter the 4 letter code for the desired location here.  See http://www.nws.noaa.gov/tg/siteloc.shtml to find a location near you.</source>
         <translation>Entrez les 4 lettres du code du lieu ici. Consulter le site http://www.nws.noaa.gov/tg/siteloc.shtml pour sélectionner le lieu le plus proche de votre position actuelle.</translation>
     </message>
     <message>
         <source>Visit http://www.nws.noaa.gov/tg/siteloc.shtml to find the nearest location.</source>
         <translation>Visitez http://www.nws.noaa.gov/tg/siteloc.shtml pour trouver le lieu le plus proche.</translation>
     </message>
     <message>
         <source>Use metric units</source>
         <translation>Utiliser l&apos;unité métrique</translation>
     </message>
     <message>
         <source>Click here to select type of units displayed.</source>
         <translation>Cliquez ici pour changer le type des unités à afficher.</translation>
     </message>
     <message>
         <source>Update frequency (in minutes):</source>
         <translation>Fréquence de mise à jour (en minutes) : </translation>
     </message>
     <message>
         <source>Select how often (in minutes) you want the weather to be updated.</source>
         <translation>Sélectionner la fréquence de mise à jour des infos météo.</translation>
     </message>
 </context>
 <context>
     <name>WeatherPluginWidget</name>
     <message>
         <source>Retreiving current weather information.</source>
         <translation>Récupération des infomations météo.</translation>
     </message>
     <message>
         <source>Temp: </source>
         <translation>Temps : </translation>
     </message>
     <message>
         <source>  Wind: </source>
         <translation>Vent : </translation>
     </message>
     <message>
         <source>
 Pres: </source>
         <translation>Pression : </translation>
     </message>
     <message>
         <source>Current weather data not available.</source>
         <translation>Information météo non disponible.</translation>
     </message>
     <message>
         <source>n/a</source>
         <translation>n/a</translation>
     </message>
     <message>
         <source>E </source>
         <translation>E</translation>
     </message>
     <message>
         <source>NE </source>
         <translation>NE</translation>
     </message>
     <message>
         <source>N </source>
         <translation>N</translation>
     </message>
     <message>
         <source>NW </source>
         <translation>NO</translation>
     </message>
     <message>
         <source>W </source>
         <translation>O</translation>
     </message>
     <message>
         <source>SW </source>
         <translation>SO</translation>
     </message>
     <message>
         <source>S </source>
         <translation>S</translation>
     </message>
     <message>
         <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,201 +1,108 @@
 <!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>
     <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>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>
     <message>
         <source>Enable medium checking</source>
         <translation>Autoriser vérification support</translation>
     </message>
     <message>
         <source>Use global settings</source>
         <translation>Utiliser les options globales</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation>Quels fichiers média</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tous</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Image</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Texte</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>Vidéo</translation>
     </message>
     <message>
         <source></source>
         <translation></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>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>
     <message>
         <source>Which media files</source>
         <translation>Quels fichiers média</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tous</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Image</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Texte</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>Vidéo</translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation>Limiter la recherche à : </translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Ajouter</translation>
     </message>
     <message>
         <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
@@ -1,49 +1,37 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>MindBreaker</name>
     <message>
         <source>New Game</source>
         <translation>Nouveau jeu</translation>
     </message>
     <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>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
 </context>
 </TS>
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
@@ -1,38 +1,34 @@
 <!DOCTYPE TS><TS>
 <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>
         <source>Game</source>
         <translation>Jeu</translation>
     </message>
     <message>
         <source>Mine Sweep</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,89 +1,50 @@
 <!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>
         <source>Image:</source>
         <translation>Image : </translation>
     </message>
 </context>
 </TS>
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
@@ -1,160 +1,112 @@
 <!DOCTYPE TS><TS>
 <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>
 <context>
     <name>ODict</name>
     <message>
         <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>
         <source>No dictionary defined</source>
         <translation>Aucun dictionnaire défini</translation>
     </message>
     <message>
         <source>&amp;Define one</source>
         <translation>&amp;En définir un</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Annuler</translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation>Configuration</translation>
     </message>
 </context>
 <context>
     <name>SearchMethodDlg</name>
     <message>
         <source>Name:</source>
         <translation>Nom : </translation>
     </message>
     <message>
         <source>Dictionary file</source>
         <translation>Fichier dictionnaire</translation>
     </message>
     <message>
         <source>Browse</source>
         <translation>Explorer</translation>
     </message>
     <message>
         <source>Language 1</source>
         <translation>Langage 1</translation>
     </message>
     <message>
         <source>Decollator</source>
         <translation>Decollator</translation>
     </message>
     <message>
         <source>Language 2</source>
         <translation>Langage 2</translation>
     </message>
     <message>
         <source>New Searchmethod</source>
         <translation>Nouvelle méthode de recherche</translation>
     </message>
     <message>
         <source>Change Searchmethod</source>
         <translation>Changer la méthode de recherche</translation>
     </message>
 </context>
 </TS>
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
@@ -411,523 +411,503 @@ de DTR (0=non)</translation>
     <message>
         <source>Device</source>
         <translation>Dispositif</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Configure Profiles</source>
         <translation>Configurer profils</translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation>Nouvelle connexion</translation>
     </message>
     <message>
         <source>Save Connection</source>
         <translation>Enregistrer connexion</translation>
     </message>
     <message>
         <source>Connect</source>
         <translation>Connecter</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>Déconnecter</translation>
     </message>
     <message>
         <source>QuickLaunch</source>
         <translation>Lancement rapide</translation>
     </message>
     <message>
         <source>The shell button launches the &quot;default&quot; profile. If there is none default values are taken</source>
         <translation>Le buton shell lance le profil par &quot;défaut&quot;. Si non présent, les valeurs sont demandées</translation>
     </message>
     <message>
         <source>Transfer file...</source>
         <translation>Transfer du fichier...</translation>
     </message>
     <message>
         <source>Line wrap</source>
         <translation>Retour à la ligne</translation>
     </message>
     <message>
         <source>Full screen</source>
         <translation>Plein écran</translation>
     </message>
     <message>
         <source>Save history</source>
         <translation>Enregistrer historique</translation>
     </message>
     <message>
         <source>Terminate</source>
         <translation>Terminer session</translation>
     </message>
     <message>
         <source>Close Window</source>
         <translation>Fermer fenêtre</translation>
     </message>
     <message>
         <source>Run Script</source>
         <translation>Lancer script</translation>
     </message>
     <message>
         <source>Record Script</source>
         <translation>Début enregistrement script</translation>
     </message>
     <message>
         <source>Save Script</source>
         <translation>Enregistrer script</translation>
     </message>
     <message>
         <source>Open Keyboard...</source>
         <translation>Ouvrir clavier...</translation>
     </message>
     <message>
         <source>New from Profile</source>
         <translation>Ouvrir profil</translation>
     </message>
     <message>
         <source>Connection</source>
         <translation>Connexion</translation>
     </message>
     <message>
         <source>Scripts</source>
         <translation>Scripts</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copier</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Coller</translation>
     </message>
     <message>
         <source>Script</source>
         <translation>Script</translation>
     </message>
     <message>
         <source>&lt;qt&gt;There is no Connection.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Aucune connexion disponible.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>History</source>
         <translation>Historique</translation>
     </message>
     <message>
         <source>New Profile</source>
         <translation>Nouveau profil</translation>
     </message>
     <message>
         <source>Save Profile</source>
         <translation>Enregister profil</translation>
     </message>
     <message>
         <source>Start log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Log</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModemConfigWidget</name>
     <message>
         <source>Modem is attached to:</source>
         <translation>Modem attaché à : </translation>
     </message>
     <message>
         <source>Enter telefon number here:</source>
         <translation>Numéro de téléphone : </translation>
     </message>
     <message>
         <source>AT commands</source>
         <translation>Commandes AT</translation>
     </message>
     <message>
         <source>Enter number</source>
         <translation>Editer</translation>
     </message>
 </context>
 <context>
     <name>NoOptions</name>
     <message>
         <source>This Plugin does not support any configurations</source>
         <translation>Ce module n&apos;est pas configurable</translation>
     </message>
 </context>
 <context>
     <name>ProfileEditorDialog</name>
     <message>
         <source>Connection</source>
         <translation>Connexion</translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
         <source>Auto connect after load</source>
         <translation>Connexion auto. au démarrage</translation>
     </message>
     <message>
         <source>Local Console</source>
         <translation>Console locale</translation>
     </message>
     <message>
         <source>New Profile</source>
         <translation>Nouveau profil</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Opie Console</source>
         <translation>Console Opie</translation>
     </message>
     <message>
         <source>Failed</source>
         <translation>Echec</translation>
     </message>
     <message>
         <source>Connecting failed for this session.</source>
         <translation>La connexion a échoué cette fois-ci.</translation>
     </message>
     <message>
         <source>Session failed</source>
         <translation>Echec de la session</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Cannot open session: Not all components were found.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Ne peut ouvrir la session: tous les composants non pas pu être trouvé.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Transfer mode</source>
         <translation>Mode de Transfère</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Envoyer</translation>
     </message>
     <message>
         <source>Receive</source>
         <translation>Recevoir</translation>
     </message>
     <message>
         <source>Send file</source>
         <translation>Envoyer fichier</translation>
     </message>
     <message>
         <source>Transfer protocol</source>
         <translation>Protocole de transfère</translation>
     </message>
     <message>
         <source>Progress</source>
         <translation>Progression</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
         <source>Ready</source>
         <translation>Prêt</translation>
     </message>
     <message>
         <source>Start transfer</source>
         <translation>Commencer le transfère</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
         <source>File transfer</source>
         <translation>Transfère fichier</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation>Attention</translation>
     </message>
     <message>
         <source>No file has been specified.</source>
         <translation>Aucun fichier spécifié.</translation>
     </message>
     <message>
         <source>Sending...</source>
         <translation>Envoie...</translation>
     </message>
     <message>
         <source>Receiving...</source>
         <translation>Réception...</translation>
     </message>
     <message>
         <source>Cancelled</source>
         <translation>Abandonné</translation>
     </message>
     <message>
         <source>The file transfer has been cancelled.</source>
         <translation>Le transfère du fichier a été abandonné.</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
         <source>Operation not supported.</source>
         <translation>Opération non supportée.</translation>
     </message>
     <message>
         <source>Transfer could not be started.</source>
         <translation>Le transfère n&apos;a pas pu commencer.</translation>
     </message>
     <message>
         <source>No error.</source>
         <translation>Aucune erreur.</translation>
     </message>
     <message>
         <source>Undefined error occured.</source>
         <translation>Une erreur inconnue est survenue.</translation>
     </message>
     <message>
         <source>Incomplete transfer.</source>
         <translation>Transfère incomplet.</translation>
     </message>
     <message>
         <source>Unknown error occured.</source>
         <translation>Erreur inconnue.</translation>
     </message>
     <message>
         <source>Sent</source>
         <translation>Envoyé</translation>
     </message>
     <message>
         <source>File has been sent.</source>
         <translation>Le fichier a été envoyé.</translation>
     </message>
     <message>
         <source>Received</source>
         <translation>Reçu</translation>
     </message>
     <message>
         <source>File has been received.</source>
         <translation>Le fichier a été reçu.</translation>
     </message>
     <message>
         <source>Profile name</source>
         <translation>Nom de profil</translation>
     </message>
     <message>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
         <source>Connection</source>
         <translation>Connexion</translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
         <source>Special Keys</source>
         <translation>Touches spéciales</translation>
     </message>
     <message>
         <source>Invalid profile</source>
         <translation>Profil invalide</translation>
     </message>
     <message>
         <source>Please enter a profile name.</source>
         <translation>Veuillez entrer un nom de profil.</translation>
     </message>
     <message>
         <source>Z-Modem</source>
         <translation>Z-Modem</translation>
     </message>
     <message>
         <source>Y-Modem</source>
         <translation>Y-Modem</translation>
     </message>
     <message>
         <source>X-Modem</source>
         <translation>X-Modem</translation>
     </message>
     <message>
         <source>Serial</source>
         <translation>Série</translation>
     </message>
     <message>
         <source>Modem</source>
         <translation>Modem</translation>
     </message>
     <message>
         <source>Local Console</source>
         <translation>Console locale</translation>
     </message>
     <message>
         <source>Default Terminal</source>
         <translation>Terminal par défaut</translation>
     </message>
     <message>
         <source>Default Keyboard</source>
         <translation>Clavier par défaut</translation>
     </message>
     <message>
         <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>
         <source>Reset speakers</source>
         <translation>Reinitialisation du haut-parleurs</translation>
     </message>
     <message>
         <source>Turning off dialtone</source>
         <translation>Désactivation du son de numérotation</translation>
     </message>
     <message>
         <source>Dial number</source>
         <translation>Numéro composé</translation>
     </message>
     <message>
         <source>Line busy, redialing number</source>
         <translation>Ligne occupée, rappel du numéro</translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation>Connexion établie</translation>
     </message>
     <message>
         <source>Dismiss</source>
         <translation>Rejeté</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Dialing the number failed.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fixing up Embedix</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SerialConfigWidget</name>
     <message>
         <source>Device</source>
         <translation>Dispositif</translation>
     </message>
 </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>
         <source>Options</source>
         <translation>Options</translation>
     </message>
     <message>
         <source>Local echo</source>
         <translation>Echo local</translation>
     </message>
     <message>
         <source>Line wrap</source>
         <translation>Retour à la ligne</translation>
     </message>
     <message>
         <source>VT 100</source>
         <translation>VT 100</translation>
     </message>
     <message>
         <source>VT 102</source>
         <translation>VT 102</translation>
     </message>
     <message>
         <source>Linux Console</source>
         <translation>Console Linux</translation>
     </message>
     <message>
         <source>X-Terminal</source>
         <translation>X-Terminal</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>green on black</source>
         <translation>vert sur noir</translation>
     </message>
     <message>
         <source>orange on black</source>
         <translation>orange sur noir</translation>
     </message>
 </context>
 </TS>
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
@@ -1,300 +1,328 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BaseSetup</name>
     <message>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slideshow timeout:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Toggle autoscale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to next image</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Delete Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Image Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></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>Browser Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Keyboard Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie Eye - Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Imageinfo Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Imageview Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Go dir up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start slideshow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and Imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show images fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto rotate images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show images unscaled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show zoomer window when unscaled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
     <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>
         <source>&lt;center&gt;&lt;b&gt;Be carefull with the following options!&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show files recursive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recursion depth:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Digital Camera View</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Name Only</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>imageinfo</name>
     <message>
         <source>View Full Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays an thumbnail of the image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays info of selected image</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,151 +1,125 @@
 <!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>
         <source>User</source>
         <translation>Utilisateur</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Mot de passe</translation>
     </message>
     <message>
         <source>Suspend</source>
         <translation>Suspendre</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Menu</translation>
     </message>
 </context>
 <context>
     <name>LoginWindowImpl</name>
     <message>
         <source>Restart</source>
         <translation>Redémarrer</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>Quitter</translation>
     </message>
     <message>
-        <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
-        <translation 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>
     <message>
         <source>&lt;b&gt;Password:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Confirm:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PasswordDialogImpl</name>
     <message>
         <source>Trying to leave without password set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;No password was set. This could lead to you not beeingable to remotely connect to your machine.Do you want to continue not setting a password?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passwords don&apos;t match</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The two passwords don&apos;t match. Please try again.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password not legal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The entered password is not a valid password.Please try entering a valid password.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -117,1067 +117,923 @@
         <source>Replace &amp;all</source>
         <translation>Remplacer &amp;tout</translation>
     </message>
     <message>
         <source>Match &amp;case</source>
         <translation>Vérifier la &amp;casse</translation>
     </message>
     <message>
         <source>Current &amp;selection only</source>
         <translation>Seulement à la &amp;sélection courante</translation>
     </message>
     <message>
         <source>&amp;Entire cell</source>
         <translation>&amp;Toute la cellule</translation>
     </message>
     <message>
         <source>Find &amp; Replace</source>
         <translation>Rechercher &amp; remplacer</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Opie Sheet</source>
         <translation>Tableur Opie</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
         <source>Inconsistency error!</source>
         <translation>Erreur d&apos;inconsistance !</translation>
     </message>
     <message>
         <source>File cannot be saved!</source>
         <translation>Impossible d&apos;enregistrer le fichier !</translation>
     </message>
     <message>
         <source>File cannot be opened!</source>
         <translation>Impossible d&apos;ouvrir le fichier !</translation>
     </message>
     <message>
         <source>Invalid file format!</source>
         <translation>Format de fichier non valide 
 !</translation>
     </message>
     <message>
         <source>Save File</source>
         <translation>Enregistrer fichier</translation>
     </message>
     <message>
         <source>Do you want to save the current file?</source>
         <translation>Voulez-vous sauvegarder le fichier actuel ?</translation>
     </message>
     <message>
         <source>&amp;File Name:</source>
         <translation>Nom de &amp;fichier:</translation>
     </message>
     <message>
         <source>UnnamedFile</source>
         <translation>Fichier sans nom</translation>
     </message>
     <message>
         <source>New File</source>
         <translation>Nouveau fichier</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Nouveau</translation>
     </message>
     <message>
         <source>Open File</source>
         <translation>Ouvrir fichier</translation>
     </message>
     <message>
         <source>&amp;Open</source>
         <translation>&amp;Ouvrir</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation>&amp;Enregistrer</translation>
     </message>
     <message>
         <source>Save File As</source>
         <translation>Enregister fichier sous</translation>
     </message>
     <message>
         <source>Save &amp;As</source>
         <translation>Enregistrer &amp;sous</translation>
     </message>
     <message>
         <source>About Opie Sheet</source>
         <translation>A propos</translation>
     </message>
     <message>
         <source>Accept</source>
         <translation>Accepter</translation>
     </message>
     <message>
         <source>&amp;Accept</source>
         <translation>&amp;Accepter</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>A&amp;nnuler</translation>
     </message>
     <message>
         <source>Cell Selector</source>
         <translation>Sélecteur de cellule</translation>
     </message>
     <message>
         <source>Cell &amp;Selector</source>
         <translation>&amp;Sélecteur de cellule</translation>
     </message>
     <message>
         <source>Cut Cells</source>
         <translation>Couper cellules</translation>
     </message>
     <message>
         <source>Cu&amp;t</source>
         <translation>Co&amp;uper</translation>
     </message>
     <message>
         <source>Copy Cells</source>
         <translation>Copier cellules</translation>
     </message>
     <message>
         <source>&amp;Copy</source>
         <translation>&amp;Copier</translation>
     </message>
     <message>
         <source>Paste Cells</source>
         <translation>Coller cellules</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>C&amp;oller</translation>
     </message>
     <message>
         <source>Paste Contents</source>
         <translation>Coller contenu</translation>
     </message>
     <message>
         <source>Paste Cont&amp;ents</source>
         <translation>Coller cont&amp;enu</translation>
     </message>
     <message>
         <source>Clear Cells</source>
         <translation>Vider les cellules</translation>
     </message>
     <message>
         <source>C&amp;lear</source>
         <translation>E&amp;ffacer</translation>
     </message>
     <message>
         <source>Insert Cells</source>
         <translation>Insérer des cellules</translation>
     </message>
     <message>
         <source>C&amp;ells</source>
         <translation>C&amp;ellules</translation>
     </message>
     <message>
         <source>Insert Rows</source>
         <translation>Insérer des lignes</translation>
     </message>
     <message>
         <source>&amp;Rows</source>
         <translation>&amp;Lignes</translation>
     </message>
     <message>
         <source>Insert Columns</source>
         <translation>Insérér des colonnes</translation>
     </message>
     <message>
         <source>&amp;Columns</source>
         <translation>&amp;Colonnes</translation>
     </message>
     <message>
         <source>Add Sheets</source>
         <translation>Ajouter une/des feuilles</translation>
     </message>
     <message>
         <source>&amp;Sheets</source>
         <translation>&amp;Feuilles</translation>
     </message>
     <message>
         <source>Cells</source>
         <translation>Cellules</translation>
     </message>
     <message>
         <source>&amp;Cells</source>
         <translation>C&amp;ellules</translation>
     </message>
     <message>
         <source>Row Height</source>
         <translation>Hauteur de ligne</translation>
     </message>
     <message>
         <source>H&amp;eight</source>
         <translation>&amp;Hauteur</translation>
     </message>
     <message>
         <source>Adjust Row</source>
         <translation>Ajuster la ligne</translation>
     </message>
     <message>
         <source>&amp;Adjust</source>
         <translation>&amp;Ajuster</translation>
     </message>
     <message>
         <source>Show Row</source>
         <translation>Montrer rangé</translation>
     </message>
     <message>
         <source>&amp;Show</source>
         <translation>&amp;Montrer</translation>
     </message>
     <message>
         <source>Hide Row</source>
         <translation>Caché rangé</translation>
     </message>
     <message>
         <source>&amp;Hide</source>
         <translation>&amp;Cacher</translation>
     </message>
     <message>
         <source>Column Width</source>
         <translation>Largeur de la colonne</translation>
     </message>
     <message>
         <source>&amp;Width</source>
         <translation>&amp;Largeur</translation>
     </message>
     <message>
         <source>Adjust Column</source>
         <translation>Ajuster la colonne</translation>
     </message>
     <message>
         <source>Show Column</source>
         <translation>Montrer colonne</translation>
     </message>
     <message>
         <source>Hide Column</source>
         <translation>Caché colonne</translation>
     </message>
     <message>
         <source>Rename Sheet</source>
         <translation>Renomer la feuille</translation>
     </message>
     <message>
         <source>&amp;Rename</source>
         <translation>&amp;Renomer</translation>
     </message>
     <message>
         <source>Remove Sheet</source>
         <translation>Effacer la feuille</translation>
     </message>
     <message>
         <source>R&amp;emove</source>
         <translation>&amp;Effacer</translation>
     </message>
     <message>
         <source>Sort Data</source>
         <translation>Trier les données</translation>
     </message>
     <message>
         <source>&amp;Sort</source>
         <translation>&amp;Trier</translation>
     </message>
     <message>
         <source>Find &amp;&amp; Replace</source>
         <translation>Rechercher &amp;&amp; Remplacer</translation>
     </message>
     <message>
         <source>&amp;Find &amp;&amp; Replace</source>
         <translation>&amp;Rechercher &amp;&amp; Remplacer</translation>
     </message>
     <message>
         <source>Equal To</source>
         <translation>Egal à</translation>
     </message>
     <message>
         <source>&amp;Equal To</source>
         <translation>&amp;Egal à</translation>
     </message>
     <message>
         <source>Addition</source>
         <translation>Addition</translation>
     </message>
     <message>
         <source>&amp;Addition</source>
         <translation>&amp;Addition</translation>
     </message>
     <message>
         <source>Subtraction</source>
         <translation>Soustraction</translation>
     </message>
     <message>
         <source>&amp;Subtraction</source>
         <translation>&amp;Soustraction</translation>
     </message>
     <message>
         <source>Multiplication</source>
         <translation>Multiplication</translation>
     </message>
     <message>
         <source>&amp;Multiplication</source>
         <translation>&amp;Multiplication</translation>
     </message>
     <message>
         <source>Division</source>
         <translation>Division</translation>
     </message>
     <message>
         <source>&amp;Division</source>
         <translation>&amp;Division</translation>
     </message>
     <message>
         <source>Open ParanthesistempCellData-&gt;row+row1, tempCellData-&gt;col+col1</source>
         <translation>Open ParanthesistempCellData-&gt;row+row1, tempCellData-&gt;col+col1</translation>
     </message>
     <message>
         <source>&amp;Open Paranthesis</source>
         <translation>&amp;Ouvrir parenthèse</translation>
     </message>
     <message>
         <source>Close Paranthesis</source>
         <translation>Fermer parenthèse</translation>
     </message>
     <message>
         <source>&amp;Close Paranthesis</source>
         <translation>&amp;Fermer parenthèse</translation>
     </message>
     <message>
         <source>Comma</source>
         <translation>virgule</translation>
     </message>
     <message>
         <source>&amp;Comma</source>
         <translation>Vir&amp;gule</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Fichier</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Editer</translation>
     </message>
     <message>
         <source>&amp;Insert</source>
         <translation>&amp;Insérer</translation>
     </message>
     <message>
         <source>&amp;Format</source>
         <translation>&amp;Format</translation>
     </message>
     <message>
         <source>&amp;Data</source>
         <translation>&amp;Donnée</translation>
     </message>
     <message>
         <source>&amp;Row</source>
         <translation>&amp;Rangé</translation>
     </message>
     <message>
         <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>
         <source>&amp;Number of sheets:</source>
         <translation>Nombre de &amp;feuille :</translation>
     </message>
     <message>
         <source>Sheet</source>
         <translation>Feuille</translation>
     </message>
     <message>
         <source>&amp;Height of each row:</source>
         <translation>&amp;Hauteur de chaque rangé :</translation>
     </message>
     <message>
         <source>&amp;Width of each column:</source>
         <translation>&amp;Largeur de chaque colonne :</translation>
     </message>
     <message>
         <source>&amp;Sheet Name:</source>
         <translation>Nom de la &amp;feuille :</translation>
     </message>
     <message>
         <source>There is only one sheet!</source>
         <translation>Il n&apos;y a qu&apos;une seule feuille de calcul!</translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation>Êtes-vous sûr?</translation>
     </message>
     <message>
         <source>&amp;Type</source>
         <translation>&amp;Type</translation>
     </message>
     <message>
         <source>Shift cells &amp;down</source>
         <translation>Déplacer cellule vers le &amp;bas</translation>
     </message>
     <message>
         <source>Shift cells &amp;right</source>
         <translation>Déplacer Cellule à &amp;droite</translation>
     </message>
     <message>
         <source>Entire ro&amp;w</source>
         <translation>Toute la &amp;rangé</translation>
     </message>
     <message>
         <source>Entire &amp;column</source>
         <translation>Toute la &amp;colonne</translation>
     </message>
     <message>
         <source>Opie Sheet
 Spreadsheet Software for Opie
 QWDC Beta Winner (as Sheet/Qt)
 
 Developed by: Serdar Ozler
 Release 1.0.2
 Release Date: October 08, 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>Tableur Opie
 Programme de type tableur pour Opie
 QWDC Beta Winner (as Sheet/Qt)
 
 Développé par: Serdar Ozler
 Release 1.0.2
 Date de Release: 8 Octobre 2002
 
 Ce produit est sous license GPL. Il est distribuable gratuitement. Si vous désirez obtenir la dernière version ainsi que le code source , visitez le site web.
 
 http://qtopia.sitebest.com</translation>
     </message>
     <message>
         <source>Import Excel file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import E&amp;xcel file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Simple</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ABS(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CEILING(x,acc)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FACT(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FLOOR(x,acc)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>INT(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MOD(x,y)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ROUND(x,digits)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SIGN(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>EXP(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>LN(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>LOG(x,b)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>LOG10(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>POWER(x,y)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SQRT(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DEGREES(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RADIANS(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PI()</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RAND()</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RANDBETWEEN(a,b)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S&amp;tandard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AND(x1,x2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>NOT(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OR(x1,x2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IF(compare,val1,val2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>INDEX(range,index)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ISBLANK(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ISNUMBER(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>EVEN(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ISEVEN(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ODD(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ISODD(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Logical-&amp;Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SIN(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>COS(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>TAN(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ASIN(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ACOS(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ATAN(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ATAN2(x,y)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SINH(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>COSH(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>TANH(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ACOSH(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ASINH(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ATANH(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Trigonometric</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>LEN(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>LEFT(s,num)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RIGHT(s,num)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MID(s,pos,len)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CONCATENATE(s1,s2..)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>EXACT(s1,s2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FIND(what,where,pos)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>REPLACE(s,pos,len,ns)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>REPT(s,n)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>UPPER(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>LOWER(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Strings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AVERAGE(range)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>COUNT(range)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>COUNTIF(range,eqls)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAX(range)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MIN(range)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SUM(range)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SUMSQ(range)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>VAR(range)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>VARP(range)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>STDEV(range)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>STDEVP(range)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SKEW(range)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>KURT(range)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sta&amp;tistical</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BESSELI(x,n)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BESSELJ(x,n)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BESSELK(x,n)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BESSELY(x,n)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BETAI(x,a,b)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ERF(a,b)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ERFC(a,b)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>GAMMALN(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>GAMMAP(x,a)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>GAMMAQ(x,a)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scienti&amp;fic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BETADIST(z,a,b,Q?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CHI2DIST(x,n,Q?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CHIDIST(x,n,Q?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FDIST(z,deg1,deg2,Q?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>GAMMADIST(x,a,b,Q?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>NORMALDIST(x,m,s,Q?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PHI(x,Q?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>POISSON(x,n,Q?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Distributions</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <translation>&amp;Options</translation>
     </message>
     <message>
         <source>&amp;Sort by</source>
         <translation>&amp;Trier par</translation>
     </message>
     <message>
         <source>&amp;Then by</source>
         <translation>&amp;Puis par</translation>
     </message>
     <message>
         <source>Then &amp;by</source>
         <translation>&amp;Ensuite par</translation>
     </message>
     <message>
         <source>&amp;Case Sensitive</source>
         <translation>Sensible à la &amp;casse</translation>
     </message>
     <message>
         <source>&amp;Direction</source>
         <translation>&amp;Direction</translation>
     </message>
     <message>
         <source>&amp;Top to bottom (rows)</source>
         <translation>De &amp;haut en bas (lignes)</translation>
     </message>
     <message>
         <source>&amp;Left to right (columns)</source>
         <translation>De &amp;gauche à droite (colonnes)</translation>
     </message>
     <message>
         <source>Sort</source>
         <translation>Tri</translation>
     </message>
     <message>
         <source>&amp;Ascending</source>
         <translation>&amp;Ascendant</translation>
     </message>
     <message>
         <source>&amp;Descending</source>
         <translation>&amp;Descendant</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
         <source>One cell cannot be sorted!</source>
         <translation>1 cellule seule ne peut être triée !</translation>
     </message>
 </context>
 </TS>
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
@@ -1,257 +1,253 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>OpieFtp</name>
     <message>
         <source>OpieFtp</source>
         <translation>Opie FTP</translation>
     </message>
     <message>
         <source>Connection</source>
         <translation>Connexion</translation>
     </message>
     <message>
         <source>Local</source>
         <translation>Locale</translation>
     </message>
     <message>
         <source>Remote</source>
         <translation>Distante</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Action</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nouvelle</translation>
     </message>
     <message>
         <source>Connect</source>
         <translation>Se connecter</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>Se déconnecter</translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation>Voir fichiers cachés</translation>
     </message>
     <message>
         <source>Upload</source>
         <translation>Envoyer</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>Créer répertoire</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Renommer</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Télécharger</translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation>Onglet connexion locale</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation>Onglet connexion distante</translation>
     </message>
     <message>
         <source>Switch to Config</source>
         <translation>Onglet configuration</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Fichier</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Taille</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
         <source>Dir</source>
         <translation>Rép</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Nom utilisateur</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Mot de passe</translation>
     </message>
     <message>
         <source>Remote server</source>
         <translation>Serveur distant</translation>
     </message>
     <message>
         <source>Remote path</source>
         <translation>Répertoire distant</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>Configuration</translation>
     </message>
     <message>
         <source>Ftp</source>
         <translation>Ftp</translation>
     </message>
     <message>
         <source>Please set the server info</source>
         <translation>Veuillez définir les paramètres
 du serveur distant</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Note</translation>
     </message>
     <message>
         <source>Unable to connect to
 </source>
         <translation>Impossible de se connecter à
 </translation>
     </message>
     <message>
         <source>Unable to log in
 </source>
         <translation>Impossible de se loguer à 
 </translation>
     </message>
     <message>
         <source>Unable to upload
 </source>
         <translation>Impossible d&apos;envoyer
 </translation>
     </message>
     <message>
         <source>Cannot upload directories</source>
         <translation>Impossible d&apos;envoyer les répertoires</translation>
     </message>
     <message>
         <source>Unable to download 
 </source>
         <translation>Impossible de télécharger
 </translation>
     </message>
     <message>
         <source>Unable to list the directory
 </source>
         <translation>Impossible de lister le répertoire</translation>
     </message>
     <message>
         <source>Unable to change directories
 </source>
         <translation>Impossible de changer de répertoire
 </translation>
     </message>
     <message>
         <source>Unable to cd up
 </source>
         <translation>Impossible de remonter</translation>
     </message>
     <message>
         <source>Unable to get working dir
 </source>
         <translation>Impossible d&apos;obtenir le rép de travail
 </translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>Changer de répertoire</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation>Voulez-vous réellement supprimer
 </translation>
     </message>
     <message>
         <source> ?
 It must be empty</source>
         <translation>?
 Il doit être vide</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Oui</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Non</translation>
     </message>
     <message>
         <source>Unable to make directory
 </source>
         <translation>Impossible de créer le répertoire
 </translation>
     </message>
     <message>
         <source>Unable to remove directory
 </source>
         <translation>Impossible de supprimer le répertoire
 </translation>
     </message>
     <message>
         <source>Unable to delete file
 </source>
         <translation>Impossible de supprimer le fichier
 </translation>
     </message>
     <message>
         <source>Unable to rename file
 </source>
         <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>
         <source>Add</source>
         <translation>Ajouter</translation>
     </message>
 </context>
 </TS>
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
@@ -1,793 +1,721 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DCCProgress</name>
     <message>
         <source>Receiving file %1 from %2...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully received %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Peer Aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Timeout</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DCCTransferTab</name>
     <message>
         <source>DCC Transfers in Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are transfers in progress. &lt;br&gt;If you close this tab, they will be canceled.&lt;br&gt;Do you want to close it anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DCC Transfer from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is trying to send you the file %2
 (%3 bytes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Reject</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCChannelTab</name>
     <message>
         <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>
         <source>Whois</source>
         <translation>Whois</translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation>Déconnecté</translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
         <translation>Connecté, enregistrement ..</translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
         <translation>Enregistrement réussi.</translation>
     </message>
     <message>
         <source>Socket error : </source>
         <translation>Erreur de socket : </translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation>Connexion fermée</translation>
     </message>
 </context>
 <context>
     <name>IRCHistoryLineEdit</name>
     <message>
         <source>Next Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Mode change has unknown type</source>
         <translation>Changement de mode de type inconnu</translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
         <translation>Changement de mode avec personne inconnue - Désynchronisé ?</translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
         <translation>Changement de mode avec drapeau inconnu</translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
         <translation>Changement de mode sur canal inconnu - Désynchronisé ?</translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
         <translation>Modes utilisateur non encore supportés</translation>
     </message>
     <message>
         <source>You were kicked from </source>
         <translation>Vous avez été éjecté de</translation>
     </message>
     <message>
         <source> by </source>
         <translation>par</translation>
     </message>
     <message>
         <source> was kicked from </source>
         <translation>éjecté de</translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
         <translation>Message d&apos;éjection d&apos;un inconnu - Désynchronisé ?</translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
         <translation>Ejection d&apos;un canal inconnu - Désynchronisé ?</translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
         <translation>Serveur de message avec canal inconnu</translation>
     </message>
     <message>
         <source>You joined channel </source>
         <translation>Vous avez joint le canal</translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
         <translation>Surnom déjà utilisé, connectez vous sous un autre surnom</translation>
     </message>
     <message>
         <source>No such nickname</source>
         <translation>Surnom inexistant</translation>
     </message>
     <message>
         <source>Received unhandled numeric command: %1</source>
         <translation>Commande numérique non supportée reçu : %1</translation>
     </message>
     <message>
         <source>Received unhandled ctcp command: %1</source>
         <translation>Commande ctcp non supportée reçu : %1</translation>
     </message>
     <message>
         <source>Received unhandled literal command: %1</source>
         <translation>Commande literale non supportée reçu : %1</translation>
     </message>
     <message>
         <source>%1 joined channel %2</source>
         <translation>%1 a join le canal %2</translation>
     </message>
     <message>
         <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>
         <source>There are %1 unknown connection(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are %1 channels formed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait a while and try again</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Whois %1 (%2@%3)
 Real name: %4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is using server %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is on channels: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Names for %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time on server %1 is %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel or nick %1 doesn&apos;t exists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is no history information for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t change nick to %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You&apos;re not on channel %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>[%1] Operation not permitted, you don&apos;t have enough channel privileges</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connected to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 has been idle for %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 signed on %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP PING with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP PING with unknown channel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP PING with bad recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP VERSION request from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING reply from %1: %2 seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malformed DCC request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
         <translation>Discution avec</translation>
     </message>
     <message>
         <source>Private discussion</source>
         <translation>Discussion privée</translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
         <translation>Entrez votre message ici pour pouvoir l&apos;envoyer à l&apos;autre personne</translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation>Déconnecté</translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
         <translation>Nom profile : </translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
         <translation>Le nom du serveur de profile dans la vue d&apos;ensemble</translation>
     </message>
     <message>
         <source>Hostname :</source>
         <translation>Nom d&apos;hôte : </translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
         <translation>Le serveur à joindre peut être un nom d&apos;hôte ou une adresse IP</translation>
     </message>
     <message>
         <source>Port :</source>
         <translation>Port : </translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
         <translation>Port du serveur à joindre. Usuellement 6667</translation>
     </message>
     <message>
         <source>Nickname :</source>
         <translation>Surnom : </translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
         <translation>Votre surnom sur le réseau IRC</translation>
     </message>
     <message>
         <source>Realname :</source>
         <translation>Nom Réel : </translation>
     </message>
     <message>
         <source>Your real name</source>
         <translation>Votre vrai nom</translation>
     </message>
     <message>
         <source>Password :</source>
         <translation>Mot de passe : </translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
         <translation>Mot de passe de connexion au serveur (si nécessaire)</translation>
     </message>
     <message>
         <source>Channels :</source>
         <translation>Canaux : </translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
         <translation>Liste des canaux que vous voulez joindre automatiquement séparés par des virgules</translation>
     </message>
     <message>
         <source>Edit server information</source>
         <translation>Editer les infomations du serveur</translation>
     </message>
     <message>
         <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>
         <translation>Liste des Serveurs</translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
         <translation>Veuillez choisir un profile de serveur</translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
         <translation>Sélectionnez dans la liste un profile de serveur et validez votre choix</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editer</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Ajouter</translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
         <translation>Détruire le profile du serveur sélectionné</translation>
     </message>
     <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>
 <context>
     <name>IRCSession</name>
     <message>
         <source>You are now known as %1</source>
         <translation type="unfinished">Vous êtes enregistrés en tant que %1</translation>
     </message>
     <message>
         <source>Nickname change of an unknown person</source>
         <translation type="unfinished">Surnom d&apos;une personne inconnu changé </translation>
     </message>
     <message>
         <source>%1 is now known as %2</source>
         <translation type="unfinished">%1 est maintenant %2</translation>
     </message>
 </context>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Lines displayed :</source>
         <translation>Lignes affichées : </translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
         <translation>Nombre de lignes à afficher lors des discussions avec qu&apos;elles soient détruites - ceci est nécessaire pour limiter l&apos;espace mémoire qu&apos;elles occupent. Mettre 0 si vous ne voulez pas de limitation</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Générale</translation>
     </message>
     <message>
         <source>Background color :</source>
         <translation>Couleur d&apos;arrière plan : </translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
         <translation>Couleur d&apos;arrière plan utilisée lors des discutions</translation>
     </message>
     <message>
         <source>Normal text color :</source>
         <translation>Couleur du texte simple : </translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
         <translation>Couleur du texte utilisée lors des discussions</translation>
     </message>
     <message>
         <source>Error color :</source>
         <translation>Couleur d&apos;erreur : </translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
         <translation>Couleur du texte utilisée par les erreurs</translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
         <translation>Couleur de votre texte : </translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
         <translation>Couleur du texte identifiant les messages que vous envoyez</translation>
     </message>
     <message>
         <source>Text written by others :</source>
         <translation>Couleur du texte des autres : </translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
         <translation>Couleur du texte identifiant les messages des autres</translation>
     </message>
     <message>
         <source>Text written by the server :</source>
         <translation>Couleur du texte du serveur : </translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
         <translation>Couleur du texte identifiant les messages du serveur</translation>
     </message>
     <message>
         <source>Notifications :</source>
         <translation>Notifications : </translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
         <translation>Couleur du texte utilisée par les notifications</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Couleurs</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Préférences</translation>
     </message>
     <message>
         <source>Display time in chat log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Keyboard Shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCTab</name>
     <message>
         <source>Missing description</source>
         <translation>Description manquante</translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
         <translation>Description contenu onglet</translation>
     </message>
     <message>
         <source>Close this tab</source>
         <translation>Fermer cet onglet</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
         <translation>Client IRC</translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
         <translation>Connexions serveur, canaux, requêtes et autres sont placés ici</translation>
     </message>
     <message>
         <source>IRC</source>
         <translation>IRC</translation>
     </message>
     <message>
         <source>New connection</source>
         <translation>Nouvelle connexion</translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
         <translation>Créer une nouvelle connexion à un serveur IRC</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Configurations</translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
         <translation>Configurer les options et l&apos;apparence d&apos;OpieIRC</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source> User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie IRC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> gives channel operator status to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> removes channel operator status from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> gives voice to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> removes voice from </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,1174 +1,880 @@
 <!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>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation>Aucun contact dans la liste d&apos;adresse.</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Vous devez sélectionner au moins une adresse.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>OK</translation>
     </message>
 </context>
 <context>
     <name>AddressPickerUI</name>
     <message>
         <source>Address Picker</source>
         <translation>Ajout d&apos;adresse</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
 </context>
 <context>
     <name>ComposeMail</name>
     <message>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Taille</translation>
     </message>
     <message>
         <source>Problem</source>
         <translation>Problème</translation>
     </message>
     <message>
         <source>&lt;p&gt;Please create an SMTP account first.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Il vous faut créer au moins un compte SMTP.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a File.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Sélectionnez un fichier.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Sending mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Store message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Store message into drafts?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished">Oui</translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished">Non</translation>
     </message>
     <message>
         <source>&lt;center&gt;Attachments will not be stored in &quot;Draft&quot; folder&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Receiver specified</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposeMailUI</name>
     <message>
         <source>Compose Message</source>
         <translation>Composer un message</translation>
     </message>
     <message>
         <source>send later</source>
         <translation>envoyer plus tard</translation>
     </message>
     <message>
         <source>use:</source>
         <translation>utiliser : </translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Message</translation>
     </message>
     <message>
         <source>Subject</source>
         <translation>Objet</translation>
     </message>
     <message>
         <source>From</source>
         <translation>De</translation>
     </message>
     <message>
         <source>To</source>
         <translation>A</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Options</translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation>Répondre à</translation>
     </message>
     <message>
         <source>BCC</source>
         <translation>Cci</translation>
     </message>
     <message>
         <source>Signature</source>
         <translation>Signature</translation>
     </message>
     <message>
         <source>CC</source>
         <translation>Cc</translation>
     </message>
     <message>
         <source>Attachment</source>
         <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>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete the selected Account?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Confirmez vous la suppression de ce compte ?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Oui</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Non</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select an account.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Veuillez sélectionner un compte.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>OK</translation>
     </message>
 </context>
 <context>
     <name>EditAccountsUI</name>
     <message>
         <source>Configure Accounts</source>
         <translation>Config. comptes</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Message</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nouveau</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Nom du compte</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editer</translation>
     </message>
     <message>
         <source>News</source>
         <translation>Nouvelles</translation>
     </message>
 </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>
         <source>Name of the Account</source>
         <translation>Nom du compte</translation>
     </message>
     <message>
         <source>Account</source>
         <translation>Compte</translation>
     </message>
     <message>
         <source>Prefix</source>
         <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>
     </message>
     <message>
         <source>Send queued mails</source>
         <translation>Envoyer e-mails en attentes</translation>
     </message>
     <message>
         <source>Show/Hide folders</source>
         <translation>Afficher/Cacher répertoires</translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation>Supprimer message</translation>
     </message>
     <message>
         <source>Edit settings</source>
         <translation>Editer paramètres</translation>
     </message>
     <message>
         <source>Configure accounts</source>
         <translation>Configurer comptes</translation>
     </message>
     <message>
         <source>Mailbox</source>
         <translation>Boîte aux lettres</translation>
     </message>
     <message>
         <source>Subject</source>
         <translation>Objet</translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Newsgroups</source>
         <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>
     </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>
 <context>
     <name>NNTPconfigUI</name>
     <message>
         <source>Configure NNTP</source>
         <translation>Config. NNTP</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Nom du compte</translation>
     </message>
     <message>
         <source>Account</source>
         <translation>Compte</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Serveur</translation>
     </message>
     <message>
         <source>Use SSL</source>
         <translation>Utiliser SSL</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Utilisateur</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Mot de passe</translation>
     </message>
     <message>
         <source>Use Login</source>
         <translation>Nécéssite un connexion</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Newsgroup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get newsgroup list from server</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Newmdirdlgui</name>
     <message>
         <source>Enter directory name</source>
         <translation>Entrez un nom de répertoire</translation>
     </message>
     <message>
         <source>Directory name:</source>
         <translation>Nom de répertoire : </translation>
     </message>
     <message>
         <source>Directory contains other subdirs</source>
         <translation>Les répertoires peuvent contenir d&apos;autre répertoires</translation>
     </message>
 </context>
 <context>
     <name>OpieMail</name>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
         <source>Mail queue flushed</source>
         <translation>Boîte d&apos;envoie vidée</translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation>Supprimer message</translation>
     </message>
     <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>Read this mail</source>
         <translation>Lire ce message</translation>
     </message>
     <message>
         <source>Delete this mail</source>
         <translation>Supprimer ce message</translation>
     </message>
     <message>
         <source>Copy/Move this mail</source>
         <translation>Copier/Déplacer ce message</translation>
     </message>
     <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&lt;br&gt;du répertoire - arrêt.&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>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>
     </message>
     <message>
         <source>Server</source>
         <translation>Serveur</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation>Utiliser sockets sécurisées :</translation>
     </message>
     <message>
         <source>ssh $SERVER exec imapd</source>
         <translation>ssh $SERVER exec imapd</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Utilisateur</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Mot de passe</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>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>
         <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>
         <source>Port of the SMTP Server</source>
         <translation>Port SMTP serveur</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Utilisateur</translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished">Utiliser sockets sécurisées :</translation>
     </message>
     <message>
         <source>ssh $SERVER exec</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SelectMailTypeUI</name>
     <message>
         <source>Select Type</source>
         <translation>Sélectionner type</translation>
     </message>
     <message>
         <source>Select Account Type</source>
         <translation>Sélectionner le type de compte</translation>
     </message>
     <message>
         <source>IMAP</source>
         <translation>IMAP</translation>
     </message>
     <message>
         <source>POP3</source>
         <translation>POP3</translation>
     </message>
     <message>
         <source>SMTP</source>
         <translation>SMTP</translation>
     </message>
 </context>
 <context>
     <name>SettingsDialogUI</name>
     <message>
         <source>Settings Dialog</source>
         <translation>Paramètres</translation>
     </message>
     <message>
         <source>View Mail</source>
         <translation>Afficher message</translation>
     </message>
     <message>
         <source>View mail as Html</source>
         <translation>Afficher message en HTML</translation>
     </message>
     <message>
         <source>Compose Mail</source>
         <translation>Composer un message</translation>
     </message>
     <message>
         <source>Send mails later ( enqueue in outbox )</source>
         <translation>Enregistrer message dans la boîte d&apos;envoie</translation>
     </message>
     <message>
         <source>Taskbar Applet</source>
         <translation>Applet de la barre des tâches</translation>
     </message>
     <message>
         <source>Disable Taskbar Applet</source>
         <translation>Désactiver l&apos;applet</translation>
     </message>
     <message>
         <source> min</source>
         <translation>min</translation>
     </message>
     <message>
         <source>Check how often</source>
         <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>
     <message>
         <source>From</source>
         <translation>De</translation>
     </message>
     <message>
         <source>To</source>
         <translation>A</translation>
     </message>
     <message>
         <source>Cc</source>
         <translation>Cc</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot reply yet.</source>
         <translation>&lt;p&gt;Le corp du message n&apos;est pas encore rapatrié. Vous ne pouvez pas y répondre.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot forward yet.</source>
         <translation>&lt;p&gt;Le corp du message n&apos;est pas encore rapatrié. Vous ne pouvez pas le faire suivre.</translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation>Supprimer message</translation>
     </message>
     <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>
         <source>Attachments</source>
         <translation>Attachements</translation>
     </message>
     <message>
         <source>Show Html</source>
         <translation>Afficher HTML</translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation>Supprimer message</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Description</translation>
     </message>
     <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>
         <translation>Sélection de la cible</translation>
     </message>
     <message>
         <source>&lt;b&gt;Store mail(s) to&lt;/b&gt;</source>
         <translation>&lt;b&gt;enregistrer message(s) dans&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Folder:</source>
         <translation>Répertoire : </translation>
     </message>
     <message>
         <source>Account:</source>
         <translation>Compte : </translation>
     </message>
     <message>
         <source>Create new folder</source>
         <translation>Créer répertoire</translation>
     </message>
     <message>
         <source>Prefix will prepend, no need to enter it!</source>
         <translation>Le préfixe sera ajouter, vous n&apos;avez pas besoin de le saisir !</translation>
     </message>
     <message>
         <source>Move mail(s)</source>
         <translation>Déplacer message(s)</translation>
     </message>
 </context>
 </TS>
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
@@ -1,320 +1,288 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AudioWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation>OpiePlayer</translation>
     </message>
 </context>
 <context>
     <name>Lib</name>
     <message>
         <source>Progress: %1 %2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediaPlayer</name>
     <message>
         <source>OpiePlayer: Initializating</source>
         <translation>OpiePlayer : Initialisation</translation>
     </message>
     <message>
         <source>OpiePlayer: </source>
         <translation>Lecteur Opie :</translation>
     </message>
     <message>
         <source> File: </source>
         <translation>Fichier :</translation>
     </message>
     <message>
         <source>, Length: </source>
         <translation>, durée :</translation>
     </message>
     <message>
         <source>Volume</source>
         <translation>Volume</translation>
     </message>
 </context>
 <context>
     <name>PlayListFileView</name>
     <message>
         <source>Title</source>
         <translation>Titre</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Taille</translation>
     </message>
     <message>
         <source>Media</source>
         <translation>Média</translation>
     </message>
     <message>
         <source>Path</source>
         <translation>Chemin</translation>
     </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Playlist Selection</source>
         <translation>Sélection liste</translation>
     </message>
 </context>
 <context>
     <name>PlayListWidget</name>
     <message>
         <source>Add to Playlist</source>
         <translation>Ajouter à la liste</translation>
     </message>
     <message>
         <source>Remove from Playlist</source>
         <translation>Supprimer de la liste</translation>
     </message>
     <message>
         <source>Play</source>
         <translation>Lecture</translation>
     </message>
     <message>
         <source>Randomize</source>
         <translation>Aléatoire</translation>
     </message>
     <message>
         <source>Loop</source>
         <translation>Boucle</translation>
     </message>
     <message>
         <source>Clear List</source>
         <translation>Vider la liste</translation>
     </message>
     <message>
         <source>Add all audio files</source>
         <translation>Ajouter tous les fichiers audio</translation>
     </message>
     <message>
         <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>
         <source>Move Up</source>
         <translation>Monter</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>Descendre</translation>
     </message>
     <message>
         <source>Play Selected</source>
         <translation>Jouer la sélection</translation>
     </message>
     <message>
         <source>Invalid File</source>
         <translation>Fichier non valide</translation>
     </message>
     <message>
         <source>There was a problem in getting the file.</source>
         <translation>Erreur lors de l&apos;obtention du fichier.</translation>
     </message>
     <message>
         <source>Remove Playlist?</source>
         <translation>Supprimer la liste ?</translation>
     </message>
     <message>
         <source>You really want to delete
 this playlist?</source>
         <translation>Voulez-vous 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>
         <source>Add Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add  URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add File to Playlist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add Files from Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opieplayer Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Opieplayer2 skin not found!&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Please install an opieplayer2 skin package.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListWidgetGui</name>
     <message>
         <source>Play Operations</source>
         <translation>Opérations de lecture</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Fichier</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Vue</translation>
     </message>
     <message>
         <source>Skins</source>
         <translation>Revêtement</translation>
     </message>
     <message>
         <source>Gamma (Video)</source>
         <translation>Gamma (video)</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
         <source>Lists</source>
         <translation>Listes</translation>
     </message>
 </context>
 <context>
     <name>SkinLoader</name>
     <message>
         <source>Loading of Skin finished</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VideoWidget</name>
     <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>
     <message>
         <source>&lt;qt&gt;Demuxing failed for this media type&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Malformed MRL&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Input failed&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Some other error&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,232 +1,154 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HelpWindow</name>
     <message>
         <source>Backward</source>
         <translation>Retour</translation>
     </message>
     <message>
         <source>Forward</source>
         <translation>Avancer</translation>
     </message>
 </context>
 <context>
     <name>QtRec</name>
     <message>
         <source>OpieRecord </source>
         <translation>OpieRecord</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
         <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>
         <source>Volume</source>
         <translation>Volume</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <source>Send with Ir</source>
         <translation>Transmettre par Ir</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Renommer</translation>
     </message>
     <message>
         <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>
 </TS>
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
@@ -1,152 +1,132 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>MainWindow</name>
     <message>
         <source>OSearch</source>
         <translation>Recherche</translation>
     </message>
     <message>
         <source>The details of the current result</source>
         <translation>Les détails du résulat courant</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Applications</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Documents</translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation>Tâches</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Agenda</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Contact</translation>
     </message>
     <message>
         <source>Search</source>
         <translation>Rechercher</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Paramètres</translation>
     </message>
     <message>
         <source>Search all</source>
         <translation>Rechercher tous</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Options</translation>
     </message>
     <message>
-        <source>Case sensitiv</source>
-        <translation 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>
         <source></source>
         <translation></translation>
     </message>
     <message>
         <source>Case sensitive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OListView</name>
     <message>
         <source>Results</source>
         <translation>Résultats</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <source>show completed tasks</source>
-        <translation 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>
         <source>open in filemanager</source>
         <translation>ouvrir dans le gestionnaire de fichiers</translation>
     </message>
     <message>
         <source>File: </source>
         <translation>Fichier :</translation>
     </message>
     <message>
         <source>Link: </source>
         <translation>Lien : </translation>
     </message>
     <message>
         <source>Mimetype: </source>
         <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>
         <source>Search in dates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search content</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,1023 +1,567 @@
 <!DOCTYPE TS><TS>
 <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>
         <source>%1 pm</source>
         <translation>%1 pm</translation>
     </message>
     <message>
         <source>%1 g/cm^3</source>
         <translation>%1 g/cm3</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation>Poids</translation>
     </message>
     <message>
         <source>Ionization Energy</source>
         <translation>Energie d&apos;ionisation</translation>
     </message>
     <message>
         <source>Boiling point</source>
         <translation>Point d&apos;ébulition</translation>
     </message>
     <message>
         <source>Melting point</source>
         <translation>Point de fusion</translation>
     </message>
 </context>
 <context>
     <name>Oxygen</name>
     <message>
         <source>Oxygen</source>
         <translation>Oxygen</translation>
     </message>
     <message>
         <source>PSE</source>
         <translation>Tableau</translation>
     </message>
     <message>
         <source>Data</source>
         <translation>Données</translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation>Calculs</translation>
     </message>
     <message>
         <source>Hydrogen</source>
         <translation>Hydrogène</translation>
     </message>
     <message>
         <source>Helium</source>
         <translation>Hellium</translation>
     </message>
     <message>
         <source>Lithium</source>
         <translation>Lithium</translation>
     </message>
     <message>
         <source>Beryllium</source>
         <translation>Béryllium</translation>
     </message>
     <message>
         <source>Boron</source>
         <translation>Bore</translation>
     </message>
     <message>
         <source>Carbon</source>
         <translation>Carbone</translation>
     </message>
     <message>
         <source>Nitrogen</source>
         <translation>Azote</translation>
     </message>
     <message>
         <source>Fluorine</source>
         <translation>Fluore</translation>
     </message>
     <message>
         <source>Neon</source>
         <translation>Néon</translation>
     </message>
     <message>
         <source>Sodium</source>
         <translation>Sodium</translation>
     </message>
     <message>
         <source>Magnesium</source>
         <translation>Magnésium</translation>
     </message>
     <message>
         <source>Aluminum</source>
         <translation>Aluminum</translation>
     </message>
     <message>
         <source>Silicon</source>
         <translation>Silicium</translation>
     </message>
     <message>
         <source>Phosphorus</source>
         <translation>Phosphore</translation>
     </message>
     <message>
         <source>Sulfur</source>
         <translation>Soufre</translation>
     </message>
     <message>
         <source>Chlorine</source>
         <translation>Chlore</translation>
     </message>
     <message>
         <source>Argon</source>
         <translation>Argon</translation>
     </message>
     <message>
         <source>Potassium</source>
         <translation>Potassium</translation>
     </message>
     <message>
         <source>Calcium</source>
         <translation>Calcium</translation>
     </message>
     <message>
         <source>Scandium</source>
         <translation>Scandium</translation>
     </message>
     <message>
         <source>Titanium</source>
         <translation>Titane</translation>
     </message>
     <message>
         <source>Vanadium</source>
         <translation>Vanadium</translation>
     </message>
     <message>
         <source>Chromium</source>
         <translation>Chrome</translation>
     </message>
     <message>
         <source>Manganese</source>
         <translation>Manganèse</translation>
     </message>
     <message>
         <source>Iron</source>
         <translation>Fer</translation>
     </message>
     <message>
         <source>Cobalt</source>
         <translation>Cobalt</translation>
     </message>
     <message>
         <source>Nickel</source>
         <translation>Nickel</translation>
     </message>
     <message>
         <source>Copper</source>
         <translation>Cuivre</translation>
     </message>
     <message>
         <source>Zinc</source>
         <translation>Zinc</translation>
     </message>
     <message>
         <source>Gallium</source>
         <translation>Gallium</translation>
     </message>
     <message>
         <source>Germanium</source>
         <translation>Germanium</translation>
     </message>
     <message>
         <source>Arsenic</source>
         <translation>Arsenique</translation>
     </message>
     <message>
         <source>Selenium</source>
         <translation>Sélénium</translation>
     </message>
     <message>
         <source>Bromine</source>
         <translation>Brome</translation>
     </message>
     <message>
         <source>Krypton</source>
         <translation>Krypton</translation>
     </message>
     <message>
         <source>Rubidium</source>
         <translation>Rubidium</translation>
     </message>
     <message>
         <source>Strontium</source>
         <translation>Strontium</translation>
     </message>
     <message>
         <source>Yttrium</source>
         <translation>Yttrium</translation>
     </message>
     <message>
         <source>Zirconium</source>
         <translation>Zirconium</translation>
     </message>
     <message>
         <source>Niobium</source>
         <translation>Niobium</translation>
     </message>
     <message>
         <source>Molybdenum</source>
         <translation>Molybdène</translation>
     </message>
     <message>
         <source>Technetium</source>
         <translation>Technitium</translation>
     </message>
     <message>
         <source>Ruthenium</source>
         <translation>Ruthénium</translation>
     </message>
     <message>
         <source>Rhodium</source>
         <translation>Rhodium</translation>
     </message>
     <message>
         <source>Palladium</source>
         <translation>Palladium</translation>
     </message>
     <message>
         <source>Silver</source>
         <translation>Argent</translation>
     </message>
     <message>
         <source>Cadmium</source>
         <translation>Cadmium</translation>
     </message>
     <message>
         <source>Indium</source>
         <translation>Indium</translation>
     </message>
     <message>
         <source>Tin</source>
         <translation>Etain</translation>
     </message>
     <message>
         <source>Antimony</source>
         <translation>Antimoine</translation>
     </message>
     <message>
         <source>Tellurium</source>
         <translation>Tellure</translation>
     </message>
     <message>
         <source>Iodine</source>
         <translation>Iode</translation>
     </message>
     <message>
         <source>Xenon</source>
         <translation>Xénon</translation>
     </message>
     <message>
         <source>Cesium</source>
         <translation>Césium</translation>
     </message>
     <message>
         <source>Barium</source>
         <translation>Barium</translation>
     </message>
     <message>
         <source>Lanthanum</source>
         <translation>Lanthane</translation>
     </message>
     <message>
         <source>Cerium</source>
         <translation>Cérium</translation>
     </message>
     <message>
         <source>Praseodymium</source>
         <translation>Praséodyme</translation>
     </message>
     <message>
         <source>Neodymium</source>
         <translation>Néodyme</translation>
     </message>
     <message>
         <source>Promethium</source>
         <translation>Prométhium</translation>
     </message>
     <message>
         <source>Samarium</source>
         <translation>Samarium</translation>
     </message>
     <message>
         <source>Europium</source>
         <translation>Europium</translation>
     </message>
     <message>
         <source>Gadolinium</source>
         <translation>Gadolinium</translation>
     </message>
     <message>
         <source>Terbium</source>
         <translation>Terbium</translation>
     </message>
     <message>
         <source>Dysprosium</source>
         <translation>Dysprosium</translation>
     </message>
     <message>
         <source>Holmium</source>
         <translation>Holmium</translation>
     </message>
     <message>
         <source>Erbium</source>
         <translation>Erbium</translation>
     </message>
     <message>
         <source>Thulium</source>
         <translation>Thulium</translation>
     </message>
     <message>
         <source>Ytterbium</source>
         <translation>Ytterbium</translation>
     </message>
     <message>
         <source>Lutetium</source>
         <translation>Lutétium</translation>
     </message>
     <message>
         <source>Hafnium</source>
         <translation>Hafnium</translation>
     </message>
     <message>
         <source>Tantalum</source>
         <translation>Tantale</translation>
     </message>
     <message>
         <source>Tungsten</source>
         <translation>Tungsten</translation>
     </message>
     <message>
         <source>Rhenium</source>
         <translation>Rhénium</translation>
     </message>
     <message>
         <source>Osmium</source>
         <translation>Osmium</translation>
     </message>
     <message>
         <source>Iridium</source>
         <translation>Iridium</translation>
     </message>
     <message>
         <source>Platinum</source>
         <translation>Platine</translation>
     </message>
     <message>
         <source>Gold</source>
         <translation>Or</translation>
     </message>
     <message>
         <source>Mercury</source>
         <translation>Mercure</translation>
     </message>
     <message>
         <source>Thallium</source>
         <translation>Thallium</translation>
     </message>
     <message>
         <source>Lead</source>
         <translation>Plomb</translation>
     </message>
     <message>
         <source>Bismuth</source>
         <translation>Bismuth</translation>
     </message>
     <message>
         <source>Polonium</source>
         <translation>Polonium</translation>
     </message>
     <message>
         <source>Astatine</source>
         <translation>Astate</translation>
     </message>
     <message>
         <source>Radon</source>
         <translation>Radon</translation>
     </message>
     <message>
         <source>Francium</source>
         <translation>Francium</translation>
     </message>
     <message>
         <source>Radium</source>
         <translation>Radium</translation>
     </message>
     <message>
         <source>Actinium</source>
         <translation>Actinium</translation>
     </message>
     <message>
         <source>Thorium</source>
         <translation>Thorium</translation>
     </message>
     <message>
         <source>Protactinium</source>
         <translation>Protactinium</translation>
     </message>
     <message>
         <source>Uranium</source>
         <translation>Uranium</translation>
     </message>
     <message>
         <source>Neptunium</source>
         <translation>Neptunium</translation>
     </message>
     <message>
         <source>Plutonium</source>
         <translation>Plutonium</translation>
     </message>
     <message>
         <source>Americium</source>
         <translation>Américium</translation>
     </message>
     <message>
         <source>Curium</source>
         <translation>Curium</translation>
     </message>
     <message>
         <source>Berkelium</source>
         <translation>Berkélium</translation>
     </message>
     <message>
         <source>Californium</source>
         <translation>Californium</translation>
     </message>
     <message>
         <source>Einsteinium</source>
         <translation>Einsteinium</translation>
     </message>
     <message>
         <source>Fermium</source>
         <translation>Fermium</translation>
     </message>
     <message>
         <source>Mendelevium</source>
         <translation>Mendélévium</translation>
     </message>
     <message>
         <source>Nobelium</source>
         <translation>Nobélium</translation>
     </message>
     <message>
         <source>Lawrencium</source>
         <translation>Lawrencium</translation>
     </message>
     <message>
         <source>Rutherfordium</source>
         <translation>Rutherfordium</translation>
     </message>
     <message>
         <source>Dubnium</source>
         <translation>Dubnium</translation>
     </message>
     <message>
         <source>Seaborgium</source>
         <translation>Seaborgium</translation>
     </message>
     <message>
         <source>Bohrium</source>
         <translation>Bohrium</translation>
     </message>
     <message>
         <source>Hassium</source>
         <translation>Hassium</translation>
     </message>
     <message>
         <source>Meitnerium</source>
         <translation>Meitnerium</translation>
     </message>
 </context>
 <context>
     <name>PSEWidget</name>
     <message>
         <source>Periodic System</source>
         <translation>Tableau périodique</translation>
     </message>
 </context>
 <context>
     <name>calcDlgUI</name>
     <message>
         <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
@@ -1,98 +1,74 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>CanvasCardWindow</name>
     <message>
         <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>
         <source>&amp;Change card backs</source>
         <translation>&amp;Changer l&apos;arrière des cartes</translation>
     </message>
     <message>
         <source>&amp;Snap to position</source>
         <translation>&amp;Retour auto sur position</translation>
     </message>
     <message>
         <source>Change card backs</source>
         <translation>Changer l&apos;arrière des cartes</translation>
     </message>
     <message>
         <source>Snap to position</source>
         <translation>Retour auto sur position</translation>
     </message>
     <message>
         <source>Turn one card</source>
         <translation>Tourner une carte</translation>
     </message>
     <message>
         <source>Turn three cards</source>
         <translation>Tourner trois cartes</translation>
     </message>
 </context>
 </TS>
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
@@ -1,605 +1,419 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation>Langue</translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation>Heure et date</translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation>Information personnelle</translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation>Onglet Document</translation>
     </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation>Problème application</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation>&lt;p&gt;%1 ne répond pas.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Voulez-vous forcer l&apos;application à quitter ?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;p&gt;Le chargement rapide a été désactivé pour cette application. Cliquez et maintenez la pression sur l&apos;icône pour la réactiver.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; a été terminée par le signal %2&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation>Application terminée</translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation>Application non trouvée</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Impossible de trouver l&apos;application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Impossible de trouver l&apos;application %1&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
 </context>
 <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>
 <context>
     <name>FirstUse</name>
     <message>
         <source>&lt;&lt; Back</source>
         <translation>&lt;&lt; Précédent</translation>
     </message>
     <message>
         <source>Next &gt;&gt;</source>
         <translation>Suivant &gt;&gt;</translation>
     </message>
     <message>
         <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>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation>Lanceur</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation>- Lanceur</translation>
     </message>
     <message>
         <source>No application</source>
         <translation>Pas d&apos;application</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation>&lt;p&gt;Aucune application définie pour ce document.&lt;p&gt;Type %1.</translation>
     </message>
     <message>
-        <source>Finding documents</source>
-        <translation type="obsolete">Recherche de documents</translation>
-    </message>
-    <message>
-        <source>Searching documents</source>
-        <translation type="obsolete">Recherche de documents</translation>
-    </message>
-    <message>
         <source>Documents</source>
         <translation>Documents</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>View as text</source>
         <translation>Ouvrir avec l&apos;éditeur de texte</translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation>&lt;b&gt;Recherche documents...&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation>Vue Icône</translation>
     </message>
     <message>
         <source>List View</source>
         <translation>Vue Liste</translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation>&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>
     </message>
     <message>
         <source>All</source>
         <translation>Tous</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Image</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Texte</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>Vidéo</translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation>Limiter la recherche à : </translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Ajouter</translation>
     </message>
     <message>
         <source>Remove</source>
         <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>
     <message>
         <source>Plugin Manager...</source>
         <translation>Gestionnaire plugins...</translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation>Redémarrer Qtopia</translation>
     </message>
     <message>
         <source>Help...</source>
         <translation>Aide...</translation>
     </message>
 </context>
 <context>
     <name>Server</name>
     <message>
         <source>USB Lock</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation>Information</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation>&lt;p&gt;La date système ne semble pas être valide.
 (%1)&lt;/p&gt;&lt;p&gt; Voulez-vous la corriger ?&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>Battery level is critical!
-Keep power off until power restored!</source>
-        <translation 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>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation>Gestionnaire plugins...</translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation>Status mémoire</translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation>Ressource mémoire faible
 Sauvegardez vos données.</translation>
     </message>
     <message>
         <source>Critical Memory Shortage
 Please end this application
 immediately.</source>
         <translation>Ressource mémoire critique!!!
 Vous devriez fermer cette
 application immédiatement.</translation>
     </message>
     <message>
         <source>WARNING</source>
         <translation>ATTENTION</translation>
     </message>
     <message>
         <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
         <translation>&lt;p&gt;Le niveau de batterie est critique !&lt;p&gt;Eteigner la machine et connectez la pour la recharger</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>The battery is running very low. </source>
         <translation>La niveau de battery est très faible.</translation>
     </message>
     <message>
         <source>&lt;p&gt;The Back-up battery is very low&lt;p&gt;Please charge the back-up battery</source>
         <translation>&lt;p&gt;La niveau de la batterie de sauvegarde est très faible.&lt;p&gt;Veuillez la rechargez ou la remplacer</translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation>Terminer</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation>Terminer Opie</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation>Redémarrer</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation>Redémarrer Opie</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation>Arrêter</translation>
     </message>
     <message>
-        <source>&lt;p&gt;
-These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
-        <translation 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
@@ -1,581 +1,260 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>LoginBase</name>
     <message>
         <source>LoginBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login</source>
         <translation type="unfinished">Nom de connexion</translation>
     </message>
     <message>
         <source>Login Automatically</source>
         <translation type="unfinished">Connexion automatique</translation>
     </message>
     <message>
         <source>If you select this option, opie-login will automagically log you in with the user you have selected in the drop-down list.  
 
 For the Zaurus 5x00 this is always the user &quot;root&quot;.</source>
         <translation type="unfinished">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="unfinished">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>
 </context>
 <context>
     <name>MultiauthConfig</name>
     <message>
         <source>Security configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the order they will appear in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
         <source>Locking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></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-securityplugin-*&lt;/em&gt; package! Once you have done that, you will be able to configure your PDA protection here.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MultiauthGeneralConfig</name>
     <message>
         <source>When to lock Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on Opie start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on Opie resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Multiple plugins authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Required successes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Don&apos;t protect this config screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show explanatory screens</source>
         <translation type="unfinished"></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>
         <source>Attention</source>
         <translation type="unfinished">Attention</translation>
     </message>
     <message>
         <source>You must save your current settings before trying to authenticate. Press OK to accept and launch a simulated authentication process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you don&apos;t like the result of this test, don&apos;t forget to change your settings before you exit the configuration application!</source>
         <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>
     </message>
     <message>
         <source>Select a net-range or enter a new one.  
 
 This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
 
 For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
 
 The entry &quot;All&quot; will allow *any* IP to connect. 
 The entry &quot;None&quot; will *deny* any connection.  
 
 If unsure, select &quot;Any&quot;.</source>
         <translation type="unfinished">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="unfinished">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="unfinished">Supprime la plage d&apos;adresse IP de la liste.</translation>
     </message>
     <message>
         <source>Restore Defaults</source>
         <translation type="unfinished">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="unfinished">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="unfinished">Sélectionnez votre logiciel de synchronisation</translation>
     </message>
     <message>
         <source>Qtopia 1.7</source>
         <translation type="unfinished">Qtopia 1.7</translation>
     </message>
     <message>
         <source>Opie 1.0</source>
         <translation type="unfinished">Opie 1.0</translation>
     </message>
     <message>
         <source>IntelliSync</source>
         <translation type="unfinished">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 type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,53 +1,45 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>SnakeGame</name>
     <message>
         <source>Snake</source>
         <translation>Serpent</translation>
     </message>
     <message>
         <source>New Game</source>
         <translation>Nouveau jeu</translation>
     </message>
     <message>
         <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
@@ -1,496 +1,368 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation>Cette zone affiche les tests disponibles, les résultats pour chaque tests et les comparaisons de leurs valeurs avec l&apos;appareil témoin sélectionné. Utilisez les cases à cocher pour définir le test que vous voulez réaliser.</translation>
     </message>
     <message>
         <source>Tests</source>
         <translation>Tests</translation>
     </message>
     <message>
         <source>Results</source>
         <translation>Résultats</translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation>Comparaison</translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation>1. Calcul sur entier</translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation>2. Calcul en virgule flottante</translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation>3. Affichage de texte</translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation>4. Affichage d&apos;image</translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation>5. Performance de la ram</translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation>6. Performance carte SD</translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation>7. Performance carte CF</translation>
     </message>
     <message>
         <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>
         <translation>Ce graphe représente la quantité de mémoire actuellement utilisée sur cette carte mémoire Compact Flash.</translation>
     </message>
     <message>
         <source>Ha</source>
         <translation>Ha</translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation>Ce graphe représente la quantité de mémoire actuellement utilisée sur ce disque dur.</translation>
     </message>
     <message>
         <source>SD</source>
         <translation>SD</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation>Ce graphe représente la quantité de mémoire actuellement utilisée sur cette carte mémoire Secure Digital.</translation>
     </message>
     <message>
         <source>SC</source>
         <translation>SC</translation>
     </message>
     <message>
         <source>In</source>
         <translation>In</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation>Ce graphe représente la quantité de mémoire actuellement utilisée dans la mémoire centrale (i.e. mémoire Flash).</translation>
     </message>
     <message>
         <source>RA</source>
         <translation>RA</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation>Ce graphe représente la quantité de mémoire actuellement utilisée sur le dique RAM.</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Utilisation du processeur par
 les applications (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>Utilisation du processeur par
 le système (%)</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Type : </translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Cette page montre la charge du processeur.</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Utilisée (%1ko)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Buffers (%1 ko)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Cache (%1 ko)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Libre (%1 ko)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Mémoire Totale : %1 Ko</translation>
     </message>
     <message>
-        <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
-Memory is categorized as follows:
-
-1. Used - memory used to by Opie and any running applications.
-2. Buffers - temporary storage used to improve performance
-3. Cached - information that has recently been used, but has not been freed yet.
-4. Free - memory not currently used by Opie or any running applications.</source>
-        <translation 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
 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>Total Swap: %1 kB</source>
         <translation>Swap Total : %1 Ko</translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Module</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Taille</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Utilisé#</translation>
     </message>
     <message>
-        <source>Used By</source>
-        <translation type="obsolete">Utilisé par</translation>
-    </message>
-    <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>Voici la liste de tous les modules chargés sur cet assistant personnel.
 
 Cliquez et maintenez appuyer pour voir les informations à propos du module ou pour le décharger.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Sélectionnez une commande puis cliquez sur le boutton &quot;Envoyer&quot; pour envoyer la commande au module sélectionné.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Envoyer</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Cliquez ici pour envoyer la commande sélectionné au module sélectionné.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Cette zone décrit en détail les informations au sujet de ce module.</translation>
     </message>
     <message>
-        <source>You really want to execute
-</source>
-        <translation type="obsolete">Voulez-vous vraiment exécuter
-
-</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>
     <message>
         <source>Available (%1 kB)</source>
         <translation>Disponible (%1 Ko)</translation>
     </message>
     <message>
         <source> : %1 kB</source>
         <translation> : %1 Ko</translation>
     </message>
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Commande</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Etat</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Temps</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation>Affiche la liste de tous les processus en cours sur cet assistant personnel
 
 Cliquez et maintenez appuyer pour voir les informations à propos du processus ou pour lui envoyer un signal.</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation>Sélectionnez un signal puis cliquez sur le boutton &quot;Envoyer&quot; pour envoyer le signal au processus sélectionné.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Envoyer</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation>Cliquer ici pour envoyer à ce processus le signal choisi.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>Cette zone montre des informations détaillés à propos de ce processus.</translation>
     </message>
     <message>
-        <source>You really want to send
-</source>
-        <translation type="obsolete">Voulez-vous vraiment envoyer
-</translation>
-    </message>
-    <message>
-        <source>You really want to send %1 to this process?</source>
-        <translation 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>
     </message>
     <message>
         <source>CPU</source>
         <translation>CPU</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Processus</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Version</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>Modules</translation>
     </message>
     <message>
         <source>Benchmark</source>
         <translation>Performance</translation>
     </message>
     <message>
         <source>Syslog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Noyau Linux&lt;/b&gt;&lt;p&gt;Version : </translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Compilé par : </translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version : </translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Construit le : </translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>&lt;p&gt;Version : </translation>
     </message>
     <message>
-        <source>&lt;p&gt;Model: </source>
-        <translation 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>
         <source>Built against Qt/E </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,538 +1,253 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FormatTabWidget</name>
     <message>
         <source>Time format</source>
         <translation>Format de l&apos;heure</translation>
     </message>
     <message>
         <source>hh:mm</source>
         <translation>hh:mm</translation>
     </message>
     <message>
         <source>D/M hh:mm</source>
         <translation>J/M hh:mm</translation>
     </message>
     <message>
         <source>M/D hh:mm</source>
         <translation>M/J hh:mm</translation>
     </message>
     <message>
         <source>12/24 hour</source>
         <translation>12/24H</translation>
     </message>
     <message>
         <source>24 hour</source>
         <translation>24H</translation>
     </message>
     <message>
         <source>12 hour</source>
         <translation>12H</translation>
     </message>
     <message>
         <source>Date format</source>
         <translation>Format de date</translation>
     </message>
     <message>
         <source>Weeks start on</source>
         <translation>Début semaine</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Dimanche</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Lundi</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>SystemTime</source>
         <translation>Heure système</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Heure</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <source>Error while getting time from network.</source>
         <translation>Erreur lors de la synchronisation de l&apos;heure.</translation>
     </message>
     <message>
         <source>Error while executing ntpdate</source>
         <translation>Erreur lors de l&apos;execution de 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>
         <source>Retrieving time from network...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NTPTabWidget</name>
     <message>
         <source>Start time</source>
         <translation>Heure de départ</translation>
     </message>
     <message>
         <source>n/a</source>
         <translation>n/a</translation>
     </message>
     <message>
         <source>Time shift</source>
         <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>
     </message>
     <message>
         <source>Predicted time</source>
         <translation>Temps prévu</translation>
     </message>
     <message>
         <source>Shift [s/h]</source>
         <translation>Dérive [s/h]</translation>
     </message>
     <message>
         <source>Last [h]</source>
         <translation>Dernière [h]</translation>
     </message>
     <message>
         <source>Offset [s]</source>
         <translation>Décalage [s]</translation>
     </message>
     <message>
         <source>Predict time</source>
         <translation>Heure prévue</translation>
     </message>
     <message>
         <source>Set predicted time</source>
         <translation>Fixer prévision de l&apos;heure</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>
         <translation>minutes entre 2 mise-à-jour
 de prévision</translation>
     </message>
     <message>
         <source>Display time server information</source>
         <translation>Afficher les informations sur
 le serveur NTP</translation>
     </message>
     <message>
         <source>Display time prediction information</source>
         <translation>Afficher les infos de prédiction
 de l&apos;heure</translation>
     </message>
 </context>
 <context>
     <name>TimeTabWidget</name>
     <message>
         <source>Hour</source>
         <translation>Heure</translation>
     </message>
     <message>
         <source>Minute</source>
         <translation>Minute</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Fuseau horaire</translation>
     </message>
     <message>
         <source>Get time from the network</source>
         <translation>Synchroniser l&apos;heure</translation>
     </message>
     <message>
         <source>Set predicted time</source>
         <translation>Fixer la prévision de l&apos;heure</translation>
     </message>
 </context>
 </TS>
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,69 +1,58 @@
 <!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>
     <message>
         <source>TableViewer - Edit Keys</source>
         <translation>TableViewer - Editeur de clés</translation>
     </message>
     <message>
         <source>Key Name</source>
         <translation>Nom clé</translation>
     </message>
     <message>
         <source>Key Type</source>
         <translation>Type de clé</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nouvelle</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>Clear All</source>
         <translation>Supprimer tout</translation>
     </message>
 </context>
 <context>
     <name>TVListView</name>
     <message>
         <source>List View</source>
         <translation>Vue Liste</translation>
     </message>
 </context>
 <context>
     <name>TableViewerWindow</name>
     <message>
         <source>Table Viewer</source>
         <translation>Table Viewer</translation>
     </message>
     <message>
         <source>could not load Document</source>
         <translation>Impossible d&apos;ouvrir le document</translation>
     </message>
 </context>
 </TS>
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
@@ -1,280 +1,274 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>TextEdit</name>
     <message>
         <source>New</source>
         <translation>Nouveau</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Ouvrir</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Enregistrer</translation>
     </message>
     <message>
         <source>Save As</source>
         <translation>Enregistrer sous</translation>
     </message>
     <message>
         <source>Cut</source>
         <translation>Couper</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copier</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Coller</translation>
     </message>
     <message>
         <source>Find...</source>
         <translation>Chercher...</translation>
     </message>
     <message>
         <source>Zoom in</source>
         <translation>Zoom avant</translation>
     </message>
     <message>
         <source>Zoom out</source>
         <translation>Zoom arrière</translation>
     </message>
     <message>
         <source>Wrap lines</source>
         <translation>Couper les lignes</translation>
     </message>
     <message>
         <source>Start with new file</source>
         <translation>Démarrer avec un nouveau fichier</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Fichier</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Edition</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Vue</translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation>Trouver suivant</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Fermer &quot;Rechercher&quot;</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation>Editeur texte</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Police</translation>
     </message>
     <message>
         <source>.desktop File</source>
         <translation>Fichier .desktop</translation>
     </message>
     <message>
         <source>Linked Document</source>
         <translation>Lien document</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tous</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Texte</translation>
     </message>
     <message>
         <source>Insert Time and Date</source>
         <translation>Insérer la date et l&apos;heure</translation>
     </message>
     <message>
         <source>Advanced Features</source>
         <translation>Options avancées</translation>
     </message>
     <message>
         <source>Prompt on Exit</source>
         <translation>Demandé avant de quitter</translation>
     </message>
     <message>
         <source>Always open linked file</source>
         <translation>Toujours ouvrir les fichiers raccourci</translation>
     </message>
     <message>
         <source>File Permissions</source>
         <translation>Permissions du fichier</translation>
     </message>
     <message>
         <source>Search Bar Open</source>
         <translation>Barre de recherche ouverte</translation>
     </message>
     <message>
         <source>Goto Line...</source>
         <translation>Aller à la ligne...</translation>
     </message>
     <message>
         <source>Auto Save 5 min.</source>
         <translation>Sauvegarde auto 5 min.</translation>
     </message>
     <message>
         <source>Text Editor has detected&lt;BR&gt;you selected a &lt;B&gt;.desktop&lt;/B&gt;file.&lt;BR&gt;Open&lt;B&gt;.desktop&lt;/B&gt; file or &lt;B&gt;linked&lt;/B&gt; file?</source>
         <translation>Vous avez sélectionné un fichier &lt;b&gt;.desktop&lt;/b&gt;.&lt;br&gt;Ouvrir le fichier &lt;b&gt;.desktop&lt;/b&gt; ou son &lt;b&gt;lien&lt;/b&gt;?</translation>
     </message>
     <message>
         <source>Text Edit</source>
         <translation>Edition de texte</translation>
     </message>
     <message>
         <source>Write Failed</source>
         <translation>L&apos;écriture a échouée</translation>
     </message>
     <message>
         <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>
         <source>Textedit</source>
         <translation>Editeur Texte</translation>
     </message>
     <message>
         <source>Textedit detected
 you have unsaved changes
 Go ahead and save?
 </source>
         <translation>Vous n&apos;avez pas sauvegardé les changements.
 Continuer et sauvegarder ?</translation>
     </message>
     <message>
         <source>Don&apos;t Save</source>
         <translation>Ne pas sauvegarder</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Annuler</translation>
     </message>
     <message>
         <source>Not enough lines</source>
         <translation>Pas assez de lignes</translation>
     </message>
     <message>
         <source>%1 - Text Editor</source>
         <translation>%1 - Editeur Texte</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>Confirmez-vous la &lt;B&gt;suppression&lt;/B&gt; du fichier courant ?&lt;BR&gt;&lt;B&gt;Cette suppression est irréversible !&lt;/B&gt;</translation>
     </message>
     <message>
         <source>Save Failed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Fixer les permissions du Fichier</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Fixer les permissions du fichier pour : </translation>
     </message>
     <message>
         <source>owner</source>
         <translation>propriétaire</translation>
     </message>
     <message>
         <source>group</source>
         <translation>groupe</translation>
     </message>
     <message>
         <source>others</source>
         <translation>autre</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Propriétaire</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Groupe</translation>
     </message>
     <message>
         <source>read</source>
         <translation>lecture</translation>
     </message>
     <message>
         <source>write</source>
         <translation>écriture</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>exécution</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Avertissement</translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation>Erreur - pas d&apos;utilisateur</translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation>Erreur - pas de groupe</translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation>Erreur lors de la définition du propriétatire ou du groupe</translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation>Erreur lors de la définition du mode</translation>
     </message>
     <message>
         <source>File Permissions</source>
         <translation>Permissions du fichier</translation>
     </message>
 </context>
 </TS>
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,49 +1,42 @@
 <!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>
     </message>
     <message>
         <source>Quit</source>
         <translation>Quitter</translation>
     </message>
     <message>
         <source>Click Play to start</source>
         <translation>Cliquez sur Jouer pour démarrer</translation>
     </message>
     <message>
         <source>Make your move</source>
         <translation>A vous de jouer</translation>
     </message>
     <message>
         <source>You won!</source>
         <translation>Vous avez gagné !</translation>
     </message>
     <message>
         <source>Computer won!</source>
         <translation>L&apos;ordinateur a gagné !</translation>
     </message>
     <message>
         <source>It&apos;s a draw</source>
         <translation>Match nul</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/today.ts b/i18n/fr/today.ts
index 4b83807..bc9481e 100644
--- a/i18n/fr/today.ts
+++ b/i18n/fr/today.ts
@@ -1,195 +1,143 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Today</name>
     <message>
         <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>
         <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>
         <translation>Aujourd&apos;hui</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
         <translation>Aujourd&apos;hui par Maximilian Reiß</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>Cliquez ici pour accéder à la fenêtre de configuration</translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
-        <source>Today config</source>
-        <translation type="obsolete">Config &quot;Aujourd&apos;hui&quot;</translation>
-    </message>
-    <message>
         <source>Load which plugins in what order:</source>
         <translation>Ordre chargement modules : </translation>
     </message>
     <message>
         <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>
         <translation>Form1</translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
         <translation>Vérifie si &quot;Aujourd&apos;hui&quot; doit-être lancer automatiquement à l&apos;allumage.</translation>
     </message>
     <message>
         <source>autostart on resume?</source>
         <translation>Démarrage auto à l&apos;allumage ?</translation>
     </message>
     <message>
         <source>tiny banner</source>
         <translation>Petite bannière</translation>
     </message>
     <message>
         <source>Have small banner </source>
         <translation>Utiliser une petite bannière</translation>
     </message>
     <message>
         <source> min</source>
         <translation>min</translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
         <translation>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>minutes inactive</source>
         <translation>minutes inactives</translation>
     </message>
     <message>
         <source> pixel</source>
         <translation>pixel</translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
         <translation>Définir la taille de l&apos;icône en pixel</translation>
     </message>
     <message>
         <source>icon size</source>
         <translation>taille icône</translation>
     </message>
     <message>
         <source> sec</source>
         <translation>sec</translation>
     </message>
     <message>
         <source>never</source>
         <translation>jamais</translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
         <translation>Périodicité de rafraîchissement de &quot;Aujourd&apos;hui&quot;</translation>
     </message>
     <message>
         <source>refresh</source>
         <translation>rafraichir</translation>
     </message>
 </context>
 </TS>
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
@@ -1,771 +1,566 @@
 <!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 %1&lt;/h1&gt;&lt;br&gt;</source>
         <translation>&lt;h1&gt;Alarme à %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">Non classée</translation>
     </message>
 </context>
 <context>
     <name>NewTaskDlg</name>
     <message>
         <source>New Task</source>
         <translation type="unfinished">Nouvelle tâche</translation>
     </message>
     <message>
         <source>Blank task</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Task Editor</source>
         <translation>Editeur de tâches</translation>
     </message>
 </context>
 <context>
     <name>Opie</name>
     <message>
         <source>Todo List</source>
         <translation type="unfinished">Liste des tâches</translation>
     </message>
     <message>
         <source>Task</source>
         <translation type="unfinished"></translation>
     </message>
 </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>
         <source>Template Editor</source>
         <translation>Editeur de modèle</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Ajouter</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editer</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Effacer</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation>Nouveau modèle %1</translation>
     </message>
     <message>
         <source>Click here to set the priority of new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Cliquez ici pour définir la prioriré de la nouvelle tâche.
 
 Cette partie est appelée &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>Entrez 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>More</source>
         <translation>Plus</translation>
     </message>
     <message>
         <source>Click here to enter additional information for new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Cliquez ici pour entrer des informations supplémentaires pour la nouvelle tâche.
 
 Cette partie est appelé &quot;la barre d&apos;outils&quot;.
 
 Elle vous permet d&apos;ajouter rapidement une nouvelle tâche à votre liste. Cette partie peut-être affichée ou cachée en selectionnant Option-&gt;&apos;Montrer la barre d&apos;outils&apos; dans le menu ci-dessus.</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Valider</translation>
     </message>
     <message>
         <source>Click here to add new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Cliquez ici pour ajouter une nouvelle tâche.
 
 Cette partie est appelé &quot;la barre d&apos;outils&quot;.
 
 Elle vous permet d&apos;ajouter rapidement une nouvelle tâche à votre liste. Cette partie peut-être affichée ou cachée en selectionnant Option-&gt;&apos;Montrer la barre d&apos;outils&apos; dans le menu ci-dessus.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
         <source>Click here to reset new task information.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Cliquez ici pour réinitialiser les informations de la nouvelle tâche.
 
 Cette partie est appelé &quot;la barre d&apos;outils&quot;.
 
 Elle vous permet d&apos;ajouter rapidement une nouvelle tâche à votre liste. Cette partie peut-être affichée ou cachée en selectionnant Option-&gt;&apos;Montrer la barre d&apos;outils&apos; dans le menu ci-dessus.</translation>
     </message>
     <message>
         <source>Summary</source>
         <translation>Résumé</translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>Table View</source>
         <translation>Vue Tableau</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Aucun</translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation>%1 jour(s)</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>New</source>
         <translation>Nouvelle</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editer</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Heure</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Type</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Description:</source>
         <translation>Description : </translation>
     </message>
     <message>
         <source>Enter brief description of the task here.</source>
         <translation>Entrer une brève description de la tâches ici.</translation>
     </message>
     <message>
         <source>Complete </source>
         <translation>Terminé</translation>
     </message>
     <message>
         <source>Work on </source>
         <translation>En cours</translation>
     </message>
     <message>
         <source>Buy </source>
         <translation>Acheter</translation>
     </message>
     <message>
         <source>Organize </source>
         <translation>Organiser</translation>
     </message>
     <message>
         <source>Get </source>
         <translation>Obtenir</translation>
     </message>
     <message>
         <source>Update </source>
         <translation>Mettre à jour</translation>
     </message>
     <message>
         <source>Create </source>
         <translation>Créer</translation>
     </message>
     <message>
         <source>Plan </source>
         <translation>Planifier</translation>
     </message>
     <message>
         <source>Call </source>
         <translation>Appeler</translation>
     </message>
     <message>
         <source>Mail </source>
         <translation>Courrier</translation>
     </message>
     <message>
         <source>Select priority of task here.</source>
         <translation>Selectionner la priorité de la tâche ici.</translation>
     </message>
     <message>
         <source>Very High</source>
         <translation>Très haute</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Haute</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normale</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Basse</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>Très basse</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Catégorie : </translation>
     </message>
     <message>
         <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>
 <context>
     <name>TaskEditorStatus</name>
     <message>
         <source>Status:</source>
         <translation>Etat : </translation>
     </message>
     <message>
         <source>Click here to set the current status of this task.</source>
         <translation>Cliquez ici pour définir l&apos;état courant de la tâche.</translation>
     </message>
     <message>
         <source>Started</source>
         <translation>Démarré</translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation>Reporté</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>Terminé</translation>
     </message>
     <message>
         <source>Not started</source>
         <translation>Non démarré</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Avancement : </translation>
     </message>
     <message>
         <source>Select progress made on this task here.</source>
         <translation>Sélectionnez l&apos;avancement de la tâche ici.</translation>
     </message>
     <message>
         <source>0 %</source>
         <translation>0 %</translation>
     </message>
     <message>
         <source>20 %</source>
         <translation>20 %</translation>
     </message>
     <message>
         <source>40 %</source>
         <translation>40 %</translation>
     </message>
     <message>
         <source>60 %</source>
         <translation>60 %</translation>
     </message>
     <message>
         <source>80 %</source>
         <translation>80 %</translation>
     </message>
     <message>
         <source>100 %</source>
         <translation>100 %</translation>
     </message>
     <message>
         <source>Start Date:</source>
         <translation>Date de début : </translation>
     </message>
     <message>
         <source>Click here to set the date this task was started.</source>
         <translation>Cliquez ici pour définir la date de début de la tâche.</translation>
     </message>
     <message>
         <source>Due Date:</source>
         <translation>Date d&apos;écheance : </translation>
     </message>
     <message>
         <source>Click here to set the date this task needs to be completed by.</source>
         <translation>Cliquez ici pour définir la date à laquelle la tâche doit-être terminée.</translation>
     </message>
     <message>
         <source>Completed:</source>
         <translation>Terminée : </translation>
     </message>
     <message>
         <source>Click here to mark this task as completed.</source>
         <translation>Cliquez ici pour définir la tâche comme &quot;Terminée&quot;.</translation>
     </message>
     <message>
         <source>Click here to set the date this task was completed.</source>
         <translation>Cliquez ici pour définir la date à laquelle la tâche a été terminée.</translation>
     </message>
     <message>
         <source>Maintainer Mode:</source>
         <translation>Mode maintenance : </translation>
     </message>
     <message>
         <source>Click here to set the maintainer&apos;s role.</source>
         <translation>Cliquez ici pour fixer le rôle du mainteneur.</translation>
     </message>
     <message>
         <source>Nothing</source>
         <translation>Sans</translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation>Responsable</translation>
     </message>
     <message>
         <source>Done By</source>
         <translation>Fait par</translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation>Coordinateur</translation>
     </message>
     <message>
         <source>Maintainer:</source>
         <translation>Mainteneur : </translation>
     </message>
     <message>
         <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
@@ -1,36 +1,32 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>GroupDialog</name>
     <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>
         <translation>Modifier un utilisateur</translation>
     </message>
 </context>
 </TS>
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,920 +1,573 @@
 <!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>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Champ 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Champ 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Champ 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Champ 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Champ 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information :</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Nouvelle entrée</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Commentaire</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Champ 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Champ 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Mot de passe</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Identifiant</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Mot de passe</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>FileDlg</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Sélection du type de fichier</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation>Editer le ComboBox FileTypeFilter ou sélectionnez le filtre</translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation>Confirme la sélection et referme le formulaire</translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation>OKButton</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation>Annule la sélection et ferme le formulaire</translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation>CancelButton</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation>Affiche le nom du fichier sélectionné</translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation>Ligne d&apos;édition du nom de fichier
 
 affiche le fichier sélectionné
 et permet de modifier son nom</translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation>Liste déroulante des répertoires
 permet de modifier ou de sélectionner les noms de répertoires</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Taille</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Liste des fichiers et dossiers</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation>Liste des fichiers et dossiers
 
 affiche la liste des répertoires et fichiers</translation>
     </message>
     <message>
         <source></source>
         <translation></translation>
     </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation>rép</translation>
     </message>
     <message>
         <source>file</source>
         <translation>fichier</translation>
     </message>
     <message>
         <source>link</source>
         <translation>lien</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Rechercher</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Identifiant</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Commentaire</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <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>
         <source>&amp;Import text file</source>
         <translation>&amp;Importer fichier texte</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
         <translation>&amp;Supprimer fichier texte</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
         <translation>&amp;Ouvrir les entrées expansées</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
         <translation>&amp;Quitter</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Fichier</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Nouveau</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Modifier</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Supprimer</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>C&amp;atégorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Couper</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>C&amp;opier</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Coller</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Rechercher</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Entrée</translation>
     </message>
     <message>
         <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>
         <source>Comment</source>
         <translation>Commentaire</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Champ 4</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
         <translation>Impossible de supprimer le fichier texte.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
         <translation>Impossible d&apos;exporter le fichier texte.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
         <translation>Impossible d&apos;importer le fichier texte.</translation>
     </message>
     <message>
         <source>Enter Password</source>
         <translation>Entrer mot de passe</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
         <translation>Mot de passe incorrect
 
 ZSave va se fermer.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
         <translation>Mot de passe incorrect.
 Rééssayer de nouveau ?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Oui</translation>
     </message>
     <message>
         <source>&amp;No.</source>
         <translation>&amp;Non.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
         <translation>Document vide ou
 mot de passe incorrect.
 Continuer ?</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;Non</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
         <translation>&amp;Oui.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
         <translation>Mot de passe vide.
 Veuillez recommencer.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
         <translation>Réentrer mot de passe</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
         <translation>Les mots de passe doivent être
 identiques. Vous devez les réentrer.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
         <translation>Fichier mot de passe enregistré.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
         <translation>Voulez-vous enregistrer
 avant de quitter ?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation>&amp;Enregistrer</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
         <translation>&amp;Enregistrer avec
 nouveau mot de passe</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
         <translation>&amp;Ne pas enregistrer</translation>
     </message>
     <message>
         <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>
         <source>Find entry</source>
         <translation>Rechercher entrée</translation>
     </message>
     <message>
         <source></source>
         <translation></translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tous</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Texte</translation>
     </message>
     <message>
         <source>Remove text file</source>
         <translation>Supprimer fichier texte</translation>
     </message>
     <message>
         <source>No document defined.
 You have to create a new document</source>
         <translation>Aucun document défini.
 Vous devez en créer un nouveau</translation>
     </message>
     <message>
         <source>Export text file</source>
         <translation>Exporter fichier texte</translation>
     </message>
     <message>
         <source>Import text file</source>
         <translation>Importer fichier texte</translation>
     </message>
     <message>
         <source>Do you want to save </source>
         <translation>Voulez-vous enregistrer</translation>
     </message>
     <message>
         <source>
 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>
         <source>&lt;P&gt;You must create a new document first. Ok to create?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Password Manager&lt;br&gt;ZSafe version 2.1.2&lt;br&gt;&lt;/b&gt;by Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Translations by Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,568 +1,488 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation>Teljes név</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Kapcsolat</translation>
     </message>
     <message>
         <source>Pick</source>
         <translation>Felvesz</translation>
     </message>
 </context>
 <context>
     <name>AbView</name>
     <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>
         <source>Unable to find a contact for this search pattern!</source>
         <translation>Ehhez a keresési mintához nem találok kapcsolatot!</translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation>A kiválasztott fájl
 nem &quot;.vcf&quot;-re végződik.
 Tényleg meg akarja nyitni?</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>Adjam hozzá a kapcsolatot?</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>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation>Keresési mód</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>Szabályos kifejezés használata</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>Helyettesítők (*,?) használata</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Kis- és nagybetű érzékeny</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Levél</translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation>QT-Mail preferálása</translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation>Opie-Mail preferálása</translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation>Megjegyzés: A QT-Mail program
 csak a SHARP alapértelmezett
 ROM-jában található. Az Opie-Mail
 ingyenesen elérhető !</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Vegyes</translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation>Keresési beállítások</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Betűkészlet</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Kicsi</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normál</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Nagy</translation>
     </message>
     <message>
         <source>Order</source>
         <translation>Sorrend</translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation>Kapcsolatok sorrendjének kiválasztása:</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Fel</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Le</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Hozzáad</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Eltávolít</translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation>Beállítás</translation>
     </message>
     <message>
         <source>Click on tab to select one</source>
         <translation>Kattintson egy fülre a kiválasztásához</translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation>A keresési mód beállításai</translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation>A keresés szabályos kifejezések alapján történik, ha ez van kiválasztva</translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
         <translation>A keresés csak helyettesítő karakterek segítségével történik, ha ez van kiválasztva</translation>
     </message>
     <message>
         <source>If selected, search differs between upper and lower chars</source>
         <translation>Ha be van jelölve, akkor a kis- és nagybetűk meg lesznek különböztetve</translation>
     </message>
     <message>
         <source>Font size for list- and card view</source>
         <translation>A lista- és kártyanézet betűmérete</translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
         <translation>Betűkészlet beállítások a lista- és kártyanézethez</translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation>A Sharp levelező programjának használata, ha elérhető</translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</source>
         <translation>Az OPIE levelező programjának használata, ha telepítve van</translation>
     </message>
     <message>
         <source>Move selected attribute one line up</source>
         <translation>A kiválasztott tulajdonság felfelé mozgatása</translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation>A kiválasztott tulajdonság lefelé mozgatása</translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation>Az összes elérhető tulajdonság listája</translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation>A lenti listában kiválasztott tulajdonság fenti listához adása</translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation>A kiválasztott tulajdonság eltávolítása a fenti listából</translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation>A sorrend (fel -&gt; le) határozza meg, hogy a lista nézet második oszlopában milyen tulajdonság jelenjen meg. (Az első fog megjelenni azok közül, amik ki vannak töltve.)</translation>
     </message>
     <message>
         <source>Tool-/Menubar</source>
         <translation>Menü- és ikonsor</translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation>Rögzített</translation>
     </message>
     <message>
         <source>Switch to fixed menu-/toolbars after restarting application !</source>
         <translation>Rögzített menü- és ikonsorra váltás az alkalmazás újraindítása után !</translation>
     </message>
     <message>
         <source>Moveable</source>
         <translation>Mozgatható</translation>
     </message>
     <message>
         <source>Switch to moveable menu-/toolbars after restarting application !</source>
         <translation>Mozgatható menü- és ikonsorra váltás az alkalmazás újraindítása után !</translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>First Name</source>
         <translation>Keresztnév</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Középső név</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Vezetéknév</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Kiterjesztés</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Rögzít mint</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Nem</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Beosztás</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Város</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Állam/Megye</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>Ország</translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation>Teljes név...</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Szervezet</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategória</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Jegyzetek...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Általános</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Üzleti</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Otthoni</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Cím</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>Irányítószám</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>Egyesült Államok</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Egyesült Királyság</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>Japán</translation>
     </message>
     <message>
         <source>France</source>
         <translation>Franciaország</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>Németország</translation>
     </message>
     <message>
         <source>Norway</source>
         <translation>Norvégia</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>Kanada</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Férfi</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Nő</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Részletek</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>Jegyzet beírása</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>Név szerkesztése</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Kapcsolatok</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation>Albánia</translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation>Algéria</translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation>Amerikai Samoa</translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation>Andorra</translation>
     </message>
     <message>
         <source>Angola</source>
         <translation>Angola</translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation>Anguilla</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>Argentína</translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation>Aruba</translation>
     </message>
     <message>
         <source>Australia</source>
         <translation>Ausztrália</translation>
     </message>
     <message>
         <source>Austria</source>
         <translation>Ausztria</translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation>Azerbajdzsán</translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation>Bahamák</translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation>Bahrain</translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation>Banglades</translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation>Barbadosz</translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation>Belarusszia</translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation>Belgium</translation>
     </message>
     <message>
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
@@ -1,453 +1,361 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>AdvancedFm</source>
         <translation>Fejlett Fájlmenedzser</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Fájl</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Nézet</translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation>Rejtett fájlok mutatása</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>Könyvtár létrehozása</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Átnevezés</translation>
     </message>
     <message>
         <source>Run Command</source>
         <translation>Parancs futtatása</translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation>Parancs futtatása kimenettel</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Törlés</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Méret</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Dátum</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Igen</translation>
     </message>
     <message>
         <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>
         <source>Ir sent.</source>
         <translation>Elküldve.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>Könyvtárváltás</translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>Futtatás</translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation>Megnyitás szövegként</translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation>Szimbólikus link készítése</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Másolás</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>Áthelyezés</translation>
     </message>
     <message>
         <source>File Info</source>
         <translation>Fájl info</translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation>Jogok beállítása</translation>
     </message>
     <message>
         <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>
         <source> kB free</source>
         <translation>kB szabad</translation>
     </message>
     <message>
         <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>
         <source>Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1 files?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1 and all it&apos;s contents?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really copy %1 files?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 already  exists. Ok to overwrite?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Could not copy %1 to %2&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy %1 As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt; %1 already exists. Ok to overwrite?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not copy %1 to %2&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt; %1 already exists. Do you really want to delete it?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not move %1&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not copy %1 to %2&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Kimenet fájlba mentése (csak név)</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Kimenet</translation>
     </message>
     <message>
         <source>Process could not start</source>
         <translation>A folyamat nem tudott elindulni</translation>
     </message>
     <message>
         <source>Error
 </source>
         <translation>Hiba
 </translation>
     </message>
     <message>
         <source>
 Finished
 </source>
         <translation>
 Befejezve
 </translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Fájl jogosultságok beállítása</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Fájl jogosultságok beállítása a következőhöz:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>tulajdonos</translation>
     </message>
     <message>
         <source>group</source>
         <translation>csoport</translation>
     </message>
     <message>
         <source>others</source>
         <translation>mindenki</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Tulajdonos</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Csoport</translation>
     </message>
     <message>
         <source>read</source>
         <translation>olvasás</translation>
     </message>
     <message>
         <source>write</source>
         <translation>írás</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>futtatás</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Figyelem</translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation>Hiba- nincs ilyen felhasználó</translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation>Hiba- nincs ilyen csoport</translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation>Hiba a tulajdonlás vagy csoport beállításakor</translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation>Hiba a jogok beállításakor</translation>
     </message>
     <message>
         <source>filePermissions</source>
         <translation>fájlJogok</translation>
     </message>
 </context>
 </TS>
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
@@ -1,232 +1,220 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Appearance</name>
     <message>
         <source>Styles control the way items such as buttons and scroll bars appear in all applications.
 
 Click here to select an available style.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings...</source>
         <translation type="unfinished">Beállítások...</translation>
     </message>
     <message>
         <source>Click here to configure the currently selected style.
 
 Note:  This option is not available for all styles.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Window decorations control the way the application title bar and its buttons appear.
 
 Click here to select an available decoration.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the desired name, style and size of the default font applications will use.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Color schemes are a collection of colors which are used for various parts of the display.
 
 Click here to select an available scheme.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation type="unfinished">Jelenlegi összeállítás</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to change the colors in the current color scheme.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Töröl</translation>
     </message>
     <message>
         <source>Click here to delete the color scheme selected in the list to the left.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished">Ment</translation>
     </message>
     <message>
         <source>Click here to name and save the current color scheme.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tab style:</source>
         <translation type="unfinished">Fül stílus:</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 type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished">Fülek</translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
         <translation type="unfinished">Fülek ikonokkal</translation>
     </message>
     <message>
         <source>Drop down list</source>
         <translation type="unfinished">Legördülő listák</translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation type="unfinished">Legördülő listák ikonokkal</translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished">Fent</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished">Lent</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotation direction:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Appearance Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Style</source>
         <translation type="unfinished">Stílus</translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished">Betű</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished">Színek</translation>
     </message>
     <message>
         <source>Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished">Haladó</translation>
     </message>
     <message>
-        <source>Restart</source>
-        <translation type="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>
         <source>Delete scheme</source>
         <translation type="unfinished">Összeállítás törtlése</translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation type="unfinished">Nem tudom a jelenlegi összeállítást törölni.</translation>
     </message>
     <message>
         <source>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>
         <translation>Összeállítás szerkesztése</translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disabled Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Highlighted Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check Box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample window using the selected settings.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/clock.ts b/i18n/hu/clock.ts
index db262c5..7040523 100644
--- a/i18n/hu/clock.ts
+++ b/i18n/hu/clock.ts
@@ -1,283 +1,206 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AlarmDlg</name>
     <message>
         <source>Clock</source>
         <translation type="unfinished">Óra</translation>
     </message>
     <message>
         <source>Snooze</source>
         <translation type="unfinished">Szundít</translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AlarmDlgBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>TextLabel1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Snooze</source>
         <translation type="unfinished">Szundít</translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thu</source>
         <comment>Thursday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fri</source>
         <comment>Friday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat</source>
         <comment>Saturday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sun</source>
         <comment>Sunday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lap/Split</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Daily Alarm:&lt;/b&gt;&lt;p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily alarm requires at least
 one day to be selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished">Mind</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished">Hang</translation>
     </message>
 </context>
 <context>
     <name>ClockBase</name>
     <message>
         <source>Clock</source>
         <translation type="unfinished">Óra</translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stopwatch</source>
         <translation type="unfinished">Stopper</translation>
     </message>
     <message>
         <source>Split</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished">Indulj</translation>
     </message>
     <message>
         <source>Starts and stops the stopwatch.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lap/Split</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Resets the stopwatch.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check to enable the daily alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the hour the alarm will sound.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the minute the alarm will sound.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished">DE</translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished">DU</translation>
     </message>
     <message>
         <source>Days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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
@@ -1,825 +1,829 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation>Naptár</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Új</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>Ma</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Nap</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Hét</translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation>HétLista</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Hónap</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Keresés</translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation>Az esemény hossza potenciálisan hosszabb
 mint az ismétlődések közötti idő.</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Az adat nem szerkeszthető, szinkronizáció folyik</translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation>Esemény szerkesztése</translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation>perc)</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Rendben</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Nincs hely</translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation>A naptár nem tudta elmenteni
 a változtatásokat.
 Szabadítson fel némi helyet és próbálja újra.
 
 Mégis kilép?</translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation>(Ismeretlen)</translation>
     </message>
     <message>
         <source>Error!</source>
         <translation>Hiba!</translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation>Javítsd ki</translation>
     </message>
     <message>
         <source>Continue</source>
         <translation>Folytat</translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error box</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation>H</translation>
     </message>
     <message>
         <source>T</source>
         <translation>K / Cs</translation>
     </message>
     <message>
         <source>W</source>
         <translation>Sz</translation>
     </message>
     <message>
         <source>F</source>
         <translation>P</translation>
     </message>
     <message>
         <source>S</source>
         <translation>Sz / V</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Hétfő</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Kedd</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Szerde</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Csütörtök</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Péntek</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Szombat</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Vasárnap</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00p</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation>Kezdet</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Vége</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Szerkeszt</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Töröl</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Átsugároz</translation>
     </message>
     <message>
         <source>This is an all day event.</source>
         <translation>Ez egy egész napos esemény.</translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this occurence</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation>:00 Du</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation>:00 De</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>Du</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>De</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished">Naptár</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>Beállítások</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation>Események mutatásának kezdete</translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation>Kezdő idő:</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation>Ébresztő beállítások</translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation>Előre beállított ébresztő</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>perc</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Vegyes</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>Sor stílus:</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Alapértelmezett</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Közepes</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Nagy</translation>
     </message>
     <message>
         <source>Views</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">Nap</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished">Hét</translation>
     </message>
     <message>
         <source>Week List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished">Hónap</translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Nem</translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished">Kezdet</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished">Iroda</translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished">Otthon</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
+    <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>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>Jan 00.-Jan 00.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstEvent</name>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Szerkeszt</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Töröl</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished">Átsugároz</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>H: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation>p</translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Calendar</source>
         <translation>Naptár</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>Ismétlés...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>Napi...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>Heti...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>Havi...</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>Évi...</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Nincs ismétlés...</translation>
     </message>
     <message>
         <source>Start Time</source>
         <translation>Kezdő időpont</translation>
     </message>
     <message>
         <source>End Time</source>
         <translation>Végső időpont</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>Új esemény</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Hely</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategória</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Találkozó</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Ebéd</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Vacsora</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Utazás</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Iroda</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Otthon</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>02 Jan 00</translation>
     </message>
     <message>
         <source>Start time</source>
         <translation type="unfinished">Kezdő időpont</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Egész nap</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Időzóna</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Ébresztő</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>perc</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Csendes</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Hangos</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Ismétlés</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Nincs ismétlés...</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Leírás</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>Kezdet - Vég</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Jegyzet...</translation>
     </message>
-    <message>
-        <source>Start Time</source>
-        <translation type="obsolete">Kezdő időpont</translation>
-    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Jegyzet szerkesztése</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Ebéd</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Kezdet</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Vég</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Minden</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 minden</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>%1-n minden</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>%1 %1-n minden</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Minden</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>hétfő</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>kedd</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>szerda</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>csütörtök</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>péntek</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>szombat</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>vasárnap</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>.</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>.</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>.</translation>
     </message>
     <message>
         <source>th</source>
         <translation>.</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation>Nincs ismétlés</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>nap</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>hét</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Ismétlés rendszere</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Nap</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Dátum</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>hónap</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>év</translation>
     </message>
     <message>
         <source>days</source>
         <translation>nap</translation>
     </message>
     <message>
         <source>day</source>
         <translation>nap</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>hét</translation>
     </message>
     <message>
         <source>week</source>
         <translation>hét</translation>
     </message>
     <message>
         <source>month</source>
         <translation>hónap</translation>
     </message>
     <message>
         <source>year</source>
         <translation>év</translation>
     </message>
     <message>
         <source> and </source>
         <translation>és</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
 és</translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, és</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Ismétlődő esemény</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nem</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Nap</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Hét</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Hónap</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Év</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Minden:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Gyakoriság</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Vége:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Nincs vége</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Ismétlés a hét ezen napjain:</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Hé</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Ke</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Sze</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Csü</translation>
     </message>
     <message>
         <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>Every</source>
         <translation>Minden</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>HétVar</translation>
     </message>
     <message>
         <source>months</source>
         <translation>hónap</translation>
     </message>
     <message>
         <source>years</source>
         <translation>év</translation>
     </message>
 </context>
 </TS>
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,110 +1,86 @@
 <!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>
         <source>Very Low</source>
         <translation>Nagyon alacsony</translation>
     </message>
     <message>
         <source>Critical</source>
         <translation>Kritikus</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Ismeretlen</translation>
     </message>
     <message>
         <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>
         <source>Remaining Power: %1%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remaining Time: %1m %2s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remaing Power: %1 %2
 Remaining Time: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ipaq  %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,71 +1,68 @@
 <!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>
     </message>
     <message>
         <source>Stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
         <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>
     </message>
 </context>
 </TS>
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
@@ -1,754 +1,601 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>OPimRecurrenceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished">Ismétlődő esemény</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Nincs</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">Nap</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished">Hét</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished">Hónap</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished">Év</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished">Minden:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished">Gyakoriság</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished">Vége:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">Nincs végső dátum</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">Ismétlés</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">Hé</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">Ke</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">Sze</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">Csü</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">Pé</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">Szo</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">Va</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">Minden</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished">Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished">HétVar</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">Nincs végső dátum</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">Ismétlés</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">Hé</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">Ke</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">Sze</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">Csü</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">Pé</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">Szo</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">Va</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">Nap</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">Minden</translation>
     </message>
 </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>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to edit the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to duplicate the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to delete the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to transmit the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</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>QObject</name>
     <message>
         <source>Priority:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Children: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">Minden</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Very high</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Very low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 %2 of every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation type="unfinished"></translation>
     </message>
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,317 +1,175 @@
 <!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>
     </message>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished"></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="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>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>
         <source>None</source>
         <translation type="unfinished">Nincs</translation>
     </message>
     <message>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Directories</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,1033 +1,991 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation>Mind</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Iktatatlan</translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation>(több.)</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Üzleti</translation>
     </message>
     <message>
         <source>Personal</source>
         <translation>Személyes</translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation>(Több.)</translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation>Mind</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>Új kategória</translation>
     </message>
     <message>
         <source>New Category </source>
         <translation>Új kategória</translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation>Kategória szerkesztése</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>Kategóriák</translation>
     </message>
     <message>
         <source>Application</source>
         <translation>Alkalmazás</translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation>Ide jönnek a kategóriák</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Hozzáad</translation>
     </message>
     <message>
         <source>Global</source>
         <translation>Globális</translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation>Válassza ki a kategóriákat melyekhez ez a dokumentum tartozik.</translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation>Ide írja be az új kategóriát. Nyomja meg a &lt;b&gt;Hozzáad&gt; gombot a listába illesztéshez.</translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation>Írja be az új kategóriát baloldalra és nyomja meg a listába illesztéshez.</translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation>Nyomja meg a kijelölt kategória törléséhez.</translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation>Ikszelje be, hogy a tulajdonság elérhető legyen minden alkalmazásnak.</translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation>Mind</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Iktatatlan</translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation>Hiba</translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation>Sajnálom, de egy másik alkalmazás
 már szerkeszti a kategóriákat.</translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation>Kategóriák szerkesztése</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Mind</translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation>Január mutatása a kiválasztott évben</translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation>Előző hónap mutatása</translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation>Következő hónap mutatása</translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation>December mutatása a kiválasztott évben</translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation>Fájlválasztó lezárása</translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation>Jelen típusú dokumentumok mutatása</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Dokumentum nézet</translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation>Ebben a kategóriában lévő dokumentumok mutatása</translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation>Bökjön a listából kiválasztani kívánt dokumentumra</translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation>, vagy válassza az &lt;b&gt;Új Dokumentum&lt;b&gt;ot új létrehozásához.</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation>&lt;br&gt;&lt;br&gt;Bökjön és tartsa a dokumentum tulajdonságaihoz.</translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation>Név</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <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>
         <source>Find what:</source>
         <translation>Mit keressen:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategória:</translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation>Keresés indulása innen:</translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation>Dec 02 01</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Kis- és nagybetűérzékeny</translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation>Keresés visszafelé</translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Document View</source>
         <translation>Dokumentum nézet</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Töröl</translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation>Fájl törlése sikertelen.</translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation>Másolata ennek</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplikál</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>Fájl másolás sikertelen.</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Részletek</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>Dokumentum mozgatása sikertelen.</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Merevlemez</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Tulajdonságok</translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation>Részletek</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>Megjegyzés:</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Típus:</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Név:</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Hely:</translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation>Gyorindítás (memóriát fogyaszt)</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Töröl</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Másol</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Átsugároz</translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation>A dokumentumot tároló média.</translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation>Ennek a dokumentumnak a neve.</translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation>Az alkalmazás előtöltése, hogy azonnal elérhető legyen.</translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation>Jelen dokumentum törlése.</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation>Jelen dokumentum másolása.</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation>Jelen dokumentum átsugárzása másik eszközre.</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation>Egyedi forgatás használata</translation>
     </message>
     <message>
         <source>Arguments:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>Tulajdonos adatai</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Rendben</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Adja meg a kódot</translation>
     </message>
 </context>
 <context>
     <name>QMessageBox</name>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Nincs hely</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>Jelen program beállítási adatainak
 elkészítésekor hiba történt.
 
 Kérem szabadítson fel némi helyet
 és próbálja meg újra.</translation>
     </message>
     <message>
         <source>Unable to create start up files
 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>
         <source>year</source>
         <translation>év</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>Du</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>De</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Hé</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Ke</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Sze</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Csü</translation>
     </message>
     <message>
         <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>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Lakás címe:&lt;b&gt;</translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation>E-mail címe:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Lakás telefon:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Lakás fax:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Lakás mobil:</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Lakás weblap:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Üzleti weblap:</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Iroda:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Üzleti telefon:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Üzleti fax:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Üzleti mobil:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Üzleti személyhívó:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Szakma:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Titkár:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Manager:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Férfi</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Nő</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Nem:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Hitves:</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Születésnap:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Évforduló:</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Becenév:</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Megszólítás</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Keresztnév</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Középső név</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Vezetéknév</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Toldalék</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Tárolás így</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Munka megnevezése</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Osztály</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Cég</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Üzleti telefon</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Üzleti fax</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Üzleti mobil</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>Alapértelmezett e-mail</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>E-mailek</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Lakás telefon</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Lakás fax</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Lakás mobil</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Üzleti cím (utca)</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Üzleti cím (város)</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>Üzleti cím (állam)</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>Üzleti cím (irányítószám)</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>Üzleti cím (ország)</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Üzleti személyhívó</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Üzleti weblap</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Iroda</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Szakma</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Titkár</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Manager</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Lakás cím (utca)</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Lakás cím (város)</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>Lakás cím (állam)</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>Lakás cím (irányítószám)</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>Lakás cím (ország)</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Lakás weblap</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Hitves</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Nem</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Születésnap</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Évforduló</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Becenév</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Gyerekek</translation>
     </message>
     <message>
         <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>
     <message>
         <source>Jan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>May</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jul</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oct</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nov</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation type="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>
     <message>
         <source>%1 document</source>
         <translation>%1 dokumentum</translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation type="unfinished">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="unfinished">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="unfinished">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 movable.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
         <translation type="unfinished">Bökjön ide, hogy ez az ablak használjon minden elérhető képernyőterületet.</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maximize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>CF kártya</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Merevlemez</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>SD kártya</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>SCSI merevlemez</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Belső tároló</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>Belső memória</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>MMC kártya</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>Nincs</translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation>városidő futtatható állomány nem található</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation>Ahhoz, hogy az időzónákat kiválassza,
 kérem telepítse fel a városidő (citytime) programot.</translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Nincs hely</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space 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>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>%1 fájl</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>%1 %2</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>Mind a %1 fájl</translation>
     </message>
     <message>
         <source>All files</source>
         <translation>Minden fájl</translation>
     </message>
 </context>
 <context>
     <name>WindowDecoration</name>
     <message>
         <source>Default</source>
         <comment>List box text for default window decoration</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,300 +1,328 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BaseSetup</name>
     <message>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slideshow timeout:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Toggle autoscale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to next image</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Delete Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Image Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></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>Browser Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Keyboard Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie Eye - Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Imageinfo Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Imageview Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Go dir up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start slideshow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and Imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show images fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto rotate images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show images unscaled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show zoomer window when unscaled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
     <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>
         <source>&lt;center&gt;&lt;b&gt;Be carefull with the following options!&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show files recursive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recursion depth:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Digital Camera View</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Name Only</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>imageinfo</name>
     <message>
         <source>View Full Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays an thumbnail of the image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays info of selected image</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,145 +1,124 @@
 <!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>
         <source>User</source>
         <translation>Felhasználó</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Jelszó</translation>
     </message>
     <message>
         <source>Suspend</source>
         <translation>Felfüggeszt</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Menü</translation>
     </message>
 </context>
 <context>
     <name>LoginWindowImpl</name>
     <message>
         <source>Restart</source>
         <translation>Újraindít</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>Kilép</translation>
     </message>
     <message>
-        <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
-        <translation type="obsolete">&lt;center&gt;%2 %1&lt;/center&gt;</translation>
-    </message>
-    <message>
         <source>Wrong password</source>
         <translation>Hibás jelszó</translation>
     </message>
     <message>
         <source>The given password is incorrect.</source>
         <translation>A megadott jelszó helytelen.</translation>
     </message>
     <message>
-        <source>OPIE was terminated
-by an uncaught signal
-(%1)
-</source>
-        <translation type="obsolete">Az OPIE egy kezeletlen
-jelzés (%1)
-miatt megállt</translation>
-    </message>
-    <message>
         <source>Failure</source>
         <translation>Hiba</translation>
     </message>
     <message>
-        <source>Could not start OPIE.</source>
-        <translation type="obsolete">Nem sikerült az OPIE-t elindítani.</translation>
-    </message>
-    <message>
         <source>Could not switch to new user identity</source>
         <translation>Nem sikerült átváltani az új felhasználóra</translation>
     </message>
     <message>
         <source>Opie was terminated
 by an uncaught signal
 (%1)
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not start Opie.</source>
         <translation type="unfinished"></translation>
     </message>
 </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>
     <message>
         <source>&lt;b&gt;Password:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Confirm:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PasswordDialogImpl</name>
     <message>
         <source>Trying to leave without password set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;No password was set. This could lead to you not beeingable to remotely connect to your machine.Do you want to continue not setting a password?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passwords don&apos;t match</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The two passwords don&apos;t match. Please try again.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password not legal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The entered password is not a valid password.Please try entering a valid password.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,817 +1,878 @@
 <!DOCTYPE TS><TS>
 <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>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerUI</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposeMail</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please create an SMTP account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a File.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Store message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Store message into drafts?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Attachments will not be stored in &quot;Draft&quot; folder&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Receiver specified</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposeMailUI</name>
     <message>
         <source>Compose Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>send later</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>use:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BCC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <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>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>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete the selected Account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select an account.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccountsUI</name>
     <message>
         <source>Configure Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>News</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IMAPconfigUI</name>
     <message>
         <source>Configure IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefix</source>
         <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>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>
     </message>
     <message>
         <source>Send queued mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show/Hide folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Newsgroups</source>
         <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>
     </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>
 <context>
     <name>NNTPconfigUI</name>
     <message>
         <source>Configure NNTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Newsgroup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get newsgroup list from server</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Newmdirdlgui</name>
     <message>
         <source>Enter directory name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directory name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directory contains other subdirs</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <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>
     </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>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></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>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec imapd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>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>
     </message>
     <message>
         <source>Use Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the SMTP Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port of the SMTP Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SelectMailTypeUI</name>
     <message>
         <source>Select Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Account Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>POP3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SMTP</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SettingsDialogUI</name>
     <message>
         <source>Settings Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View mail as Html</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compose Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mails later ( enqueue in outbox )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></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>
     </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>
     </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>
     </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>
     </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>
     </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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Store mail(s) to&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Folder:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create new folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefix will prepend, no need to enter it!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move mail(s)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,586 +1,415 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished">Applikáció probléma</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;%1 nem válaszol.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Akarja, hogy bezárjam az alkalmazást?&lt;p&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <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>
 <context>
     <name>FirstUse</name>
     <message>
         <source>&lt;&lt; Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next &gt;&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap anywhere on the screen to continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait, loading %1 settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finish</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputMethods</name>
     <message>
         <source>Unicode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation type="unfinished">Indító</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished">- Indító</translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished">Nincs alkalmazás</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished">&lt;p&gt;Ehhez a dokumentumhoz nincs alkalmazás megadva.&lt;p&gt;Típusa: %1.</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished">Dokumentumok</translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>Icon View</source>
         <translation type="unfinished">Ikon nézet</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished">Listanézet</translation>
     </message>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
-        <source>%1 files</source>
-        <translation type="obsolete">%1 fájl</translation>
-    </message>
-    <message>
-        <source>All types of file</source>
-        <translation type="obsolete">Minden fájltípus</translation>
-    </message>
-    <message>
         <source>Document View</source>
         <translation type="unfinished">Dokumentum nézet</translation>
     </message>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>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>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished">Minden</translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished">Kép</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished">Szöveg</translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished">Videó</translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished">Hozzáad</translation>
     </message>
     <message>
         <source>Remove</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">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>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Server</name>
     <message>
         <source>USB Lock</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation type="unfinished">Információ</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;A rendszer dátum nem tűnik helyesnek.
 (%1)&lt;/p&gt;&lt;p&gt;Akarja korrigálni az órát?&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>Battery level is critical!
-Keep power off until power restored!</source>
-        <translation type="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>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Critical Memory Shortage
 Please end this application
 immediately.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WARNING</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The battery is running very low. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The Back-up battery is very low&lt;p&gt;Please charge the back-up battery</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation type="unfinished">Bezárás</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation type="unfinished">Opie bezárása</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation type="unfinished">Újraindít</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation type="unfinished">Opie újraindítása</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation type="unfinished">Leállítás</translation>
     </message>
     <message>
-        <source>&lt;p&gt;
-These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
-        <translation type="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
@@ -1,398 +1,358 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tests</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSysInfo</name>
     <message>
         <source>CF</source>
         <translation type="unfinished">CF</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation type="unfinished">Ez a grafikon jelképezi, hogy mennyi memória van felhasználva ezen a Compact Flash memóriakártyán.</translation>
     </message>
     <message>
         <source>Ha</source>
         <translation type="unfinished">Ha</translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation type="unfinished">Ez a grafikon jelképezi, hogy mennyi tárhely van felhasználva ezen merevlemezen.</translation>
     </message>
     <message>
         <source>SD</source>
         <translation type="unfinished">SD</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation type="unfinished">Ez a grafikon jelképezi, hogy mennyi memória van felhasználva ezen a Secure Digital memóriakártyán.</translation>
     </message>
     <message>
         <source>SC</source>
         <translation type="unfinished">SC</translation>
     </message>
     <message>
         <source>In</source>
         <translation type="unfinished">In</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation type="unfinished">Ez a grafikon jelképezi, hogy mennyi memória van felhasználva a beépített (Flash) memóriából ezen az kéziszámítógépen.</translation>
     </message>
     <message>
         <source>RA</source>
         <translation type="unfinished">RA</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation type="unfinished">Ez a grafikon jelképezi, hogy mennyi memória van felhasználva az ideiglenes RAM diszken.</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Alkalmazás CPU használat (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>Rendszer CPU használat (%)</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Típus:</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Ez a lap megmutatja, mennyire van az eszköz processzora kihasználva.</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Felhasznált (%)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Átmeneti tár (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Gyorsítótár (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Szabad (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Teljes memória: %1 kB</translation>
     </message>
     <message>
-        <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
-Memory is categorized as follows:
-
-1. Used - memory used to by Opie and any running applications.
-2. Buffers - temporary storage used to improve performance
-3. Cached - information that has recently been used, but has not been freed yet.
-4. Free - memory not currently used by Opie or any running applications.</source>
-        <translation type="obsolete">Ez a lap megmutatja, a memória (azaz RAM) hogyan van felosztva az ön kéziszámítógépében.
-A memória az alábbiak szerint van kategoruzálva:
-
-1. Felhasznált - az Opie és más futó alkalmazások által felhasznált memória.
-2. Átmeneti tár - ideiglenes tároló a teljesítmény növeléséhez.
-3. Gyorsítótár - nemrég használt, de még fel nem szabadított információk.
-4. Szabad - az Opie vagy más futó alkalmazás által fel nem használt memória.</translation>
-    </message>
-    <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Modul</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Méret</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Használat#</translation>
     </message>
     <message>
-        <source>Used By</source>
-        <translation type="obsolete">Használja</translation>
-    </message>
-    <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>Ez a lista a kernelbe jelenleg betöltött modulokat mutatja.
 
 Bökjön a modul nevére és tartsa, hogy további információkat kapjon a modulról vagy eltávolítsa azt.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Válasszon ki itt egy parancsot és bökjön a jobboldali Küld gombra, hogy a parancsot elküldje a fent kiválasztott modulnak.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Küld</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Bökjön ide, hogy a kiválasztott parancsot elküldje a fent kiválasztott modulnak.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Ez a terület részletes információkat mutat erről a modulról.</translation>
     </message>
     <message>
-        <source>You really want to execute
-</source>
-        <translation type="obsolete">Tényleg futtatni akarja
-</translation>
-    </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>
         <source>Used (%1 kB)</source>
         <translation>Felhasznált (%1 kB)</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>Elérhető (%1 kB)</translation>
     </message>
     <message>
         <source> : %1 kB</source>
         <translation>:%1 kB</translation>
     </message>
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Parancs</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Állapot</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Idő</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation>Ez kéziszámítógépen futó processzek listája.
 
 Bökjön a processzre és tartsa, hogy további információkat kapjon a processzről, vagy jelzést küldjön annak.</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation>Válasszon egy jelzést itt, majd bökjön a jobboldali Küld gombra, hogy elküldje a processznek.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Küld</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation>Bökjön ide, hogy elküldje a kiválasztott jelzést ennek a processznek.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>Ez a terület részletes információkat mutat erről a processzről.</translation>
     </message>
     <message>
-        <source>You really want to send
-</source>
-        <translation type="obsolete">Biztosan küldeni akar
-</translation>
-    </message>
-    <message>
         <source>Really want to send %1
 to this process?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>Rendszer Információ</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Memória</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Tároló</translation>
     </message>
     <message>
         <source>CPU</source>
         <translation>CPU</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Processzek</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Verzió</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>Modulok</translation>
     </message>
     <message>
         <source>Benchmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syslog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Verzió:</translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Fordította:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Magyar fordítás: Czakó Krisztián (slapic@linux.co.hu)
 &lt;p&gt;Verzió:</translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Készült:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>&lt;p&gt;Verzió:</translation>
     </message>
     <message>
-        <source>&lt;p&gt;Model: </source>
-        <translation 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>
         <source>Built against Qt/E </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,190 +1,142 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <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>
         <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>
         <translation>Ma</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
         <translation>Készítette Maximilian Reiß</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>Bökjön ide a beállításhoz</translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>Mely kiegészítő milyen sorrendben töltödjön be:</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>Mozgasd fel</translation>
     </message>
     <message>
         <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
         <translation type="unfinished">Ikszelje be ha a Ma bekapcsoláskor el kell induljon.</translation>
     </message>
     <message>
         <source>autostart on resume?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tiny banner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Have small banner </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
         <translation type="unfinished">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>minutes inactive</source>
         <translation type="unfinished">perc iniaktivitás</translation>
     </message>
     <message>
         <source> pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
         <translation type="unfinished">Az ikon méretét állítja be pixelben</translation>
     </message>
     <message>
         <source>icon size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> sec</source>
         <translation type="unfinished">másodperc</translation>
     </message>
     <message>
         <source>never</source>
         <translation type="unfinished">soha</translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
         <translation type="unfinished">Milyen gyakran frissítse a Ma önmagát</translation>
     </message>
     <message>
         <source>refresh</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,654 +1,566 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;h1&gt;Alarm at %1&lt;/h1&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished">Iktatatlan</translation>
     </message>
 </context>
 <context>
     <name>NewTaskDlg</name>
     <message>
         <source>New Task</source>
         <translation type="unfinished">Új feladat</translation>
     </message>
     <message>
         <source>Blank task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Using template:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Alarms</source>
         <translation>Ébresztők</translation>
     </message>
     <message>
         <source>Information</source>
         <translation>Információ</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Állapot</translation>
     </message>
     <message>
         <source>Recurrence</source>
         <translation>Ismétlődés</translation>
     </message>
     <message>
         <source>Task Editor</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie</name>
     <message>
         <source>Todo List</source>
         <translation type="unfinished">Teendők listája</translation>
     </message>
     <message>
         <source>Task</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
         <translation>Feladat bevitele</translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation>Feladat szerkesztése</translation>
     </message>
     <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>
         <source>Edit</source>
         <translation type="unfinished">Szerkeszt</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished">Eltávolít</translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Név</translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation type="unfinished">új sablon %1</translation>
     </message>
     <message>
         <source>Click here to set the priority of new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation type="unfinished">Bökjön ide az új feladat fontosságának beállításához.
 
 Ezt a területet gyors feladatcsíknak hívjuk.
 
 Lehetővé teszi, hogy gyorsan felvegyen új feladatokat a listába. Ez a terület mutatható vagy elrejthető a Beállítások-&gt;&apos;Mutasd a gyors feladatcsíkot&apos; menüből.</translation>
     </message>
     <message>
         <source>Enter description of new task here.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation type="unfinished">Írja be az új feladat leírását ide.
 
 Ezt a területet gyors feladatcsíknak hívjuk.
 
 Lehetővé teszi, hogy gyorsan felvegyen új feladatokat a listába. Ez a terület mutatható vagy elrejthető a Beállítások-&gt;&apos;Mutasd a gyors feladatcsíkot&apos; menüből.</translation>
     </message>
     <message>
         <source>More</source>
         <translation type="unfinished">Több</translation>
     </message>
     <message>
         <source>Click here to enter additional information for new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation type="unfinished">Bökjön ide, hogy beírjon kiegészítő információkat az új feladathoz.
 
 Ezt a területet gyors feladatcsíknak hívjuk.
 
 Lehetővé teszi, hogy gyorsan felvegyen új feladatokat a listába. Ez a terület mutatható vagy elrejthető a Beállítások-&gt;&apos;Mutasd a gyors feladatcsíkot&apos; menüből.</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation type="unfinished">Bevisz</translation>
     </message>
     <message>
         <source>Click here to add new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation type="unfinished">Bökjön ide új feladat hozzáadásához.
 
 Ezt a területet gyors feladatcsíknak hívjuk.
 
 Lehetővé teszi, hogy gyorsan felvegyen új feladatokat a listába. Ez a terület mutatható vagy elrejthető a Beállítások-&gt;&apos;Mutasd a gyors feladatcsíkot&apos; menüből.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished">Mégsem</translation>
     </message>
     <message>
         <source>Click here to reset new task information.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation type="unfinished">Bökjön ide az új feladat információk alaphelyzetbe hozásához.
 
 Ezt a területet gyors feladatcsíknak hívjuk.
 
 Lehetővé teszi, hogy gyorsan felvegyen új feladatokat a listába. Ez a terület mutatható vagy elrejthető a Beállítások-&gt;&apos;Mutasd a gyors feladatcsíkot&apos; menüből.</translation>
     </message>
     <message>
         <source>Data can not be edited, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data can&apos;t be edited, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>Table View</source>
         <translation>Tábla nézet</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nincs</translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation>%1 nap</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>New</source>
         <translation>Új</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Szerkeszt</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Töröl</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Description:</source>
         <translation>Leírás:</translation>
     </message>
     <message>
         <source>Enter brief description of the task here.</source>
         <translation>Írja be a feladat rövid leírását ide.</translation>
     </message>
     <message>
         <source>Complete </source>
         <translation>Teljesítsd a</translation>
     </message>
     <message>
         <source>Work on </source>
         <translation>Dolgozz a</translation>
     </message>
     <message>
         <source>Buy </source>
         <translation>Vegyél</translation>
     </message>
     <message>
         <source>Organize </source>
         <translation>Szervezd a</translation>
     </message>
     <message>
         <source>Get </source>
         <translation>Szerezz be</translation>
     </message>
     <message>
         <source>Update </source>
         <translation>Frissítsd a</translation>
     </message>
     <message>
         <source>Create </source>
         <translation>Készíts</translation>
     </message>
     <message>
         <source>Plan </source>
         <translation>Tervezz</translation>
     </message>
     <message>
         <source>Call </source>
         <translation>Hívd fel</translation>
     </message>
     <message>
         <source>Mail </source>
         <translation>Írj levelet</translation>
     </message>
     <message>
         <source>Select priority of task here.</source>
         <translation>Válassza ki a feladat fontosságát itt.</translation>
     </message>
     <message>
         <source>Very High</source>
         <translation>Nagyon fontos</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Fontos</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normál</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Alacsony</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>Nagyon alacsony</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategória:</translation>
     </message>
     <message>
         <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>
 <context>
     <name>TaskEditorStatus</name>
     <message>
         <source>Status:</source>
         <translation>Állapot:</translation>
     </message>
     <message>
         <source>Click here to set the current status of this task.</source>
         <translation>Bökjön ide, hogy beállítsa a jelenlegi feladat állapotát.</translation>
     </message>
     <message>
         <source>Started</source>
         <translation>Elkezdve</translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation>Elhalasztva</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>Befejezve</translation>
     </message>
     <message>
         <source>Not started</source>
         <translation>Nincs elkezdve</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Haladás:</translation>
     </message>
     <message>
         <source>Select progress made on this task here.</source>
         <translation>Válassza ki a feladat előrehaladtát itt.</translation>
     </message>
     <message>
         <source>0 %</source>
         <translation>0 %</translation>
     </message>
     <message>
         <source>20 %</source>
         <translation>20 %</translation>
     </message>
     <message>
         <source>40 %</source>
         <translation>40 %</translation>
     </message>
     <message>
         <source>60 %</source>
         <translation>60 %</translation>
     </message>
     <message>
         <source>80 %</source>
         <translation>80 %</translation>
     </message>
     <message>
         <source>100 %</source>
         <translation>100 %</translation>
     </message>
     <message>
         <source>Start Date:</source>
         <translation>Kezdőnap:</translation>
     </message>
     <message>
         <source>Click here to set the date this task was started.</source>
         <translation>Bökjön ide, hogy beállítsa mely napon kezdődött ez a feladat.</translation>
     </message>
     <message>
         <source>Due Date:</source>
         <translation>Határidő:</translation>
     </message>
     <message>
         <source>Click here to set the date this task needs to be completed by.</source>
         <translation>Bökjön ide, hogy beállítsa mikorra kellene a feladatnak elkészülnie.</translation>
     </message>
     <message>
         <source>Completed:</source>
         <translation>Teljesítve:</translation>
     </message>
     <message>
         <source>Click here to mark this task as completed.</source>
         <translation>Bökjön ide, hogy a feladatot teljesítettnek jelölje.</translation>
     </message>
     <message>
         <source>Click here to set the date this task was completed.</source>
         <translation>Bökjön ide, hogy beállíthassa mikor teljesítette a feladatot.</translation>
     </message>
     <message>
         <source>Maintainer Mode:</source>
         <translation>Karbantartó mód:</translation>
     </message>
     <message>
         <source>Click here to set the maintainer&apos;s role.</source>
         <translation>Bökjön ide, hogy beállítsa a karbantartó szerepét.</translation>
     </message>
     <message>
         <source>Nothing</source>
         <translation>Semmi</translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation>Felelős</translation>
     </message>
     <message>
         <source>Done By</source>
         <translation>Elvégezte</translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation>Koordinálja</translation>
     </message>
     <message>
         <source>Maintainer:</source>
         <translation>Karbantartó:</translation>
     </message>
     <message>
         <source>This is the name of the current task maintainer.</source>
         <translation>Ez a jelenlegi feladat karbantartójának neve.</translation>
     </message>
     <message>
         <source>test</source>
         <translation>próba</translation>
     </message>
     <message>
         <source>Click here to select the task maintainer.</source>
         <translation>Bökjön ide, hogy beállítsa a feladat karbantartóját.</translation>
     </message>
 </context>
 </TS>
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,832 +1,566 @@
 <!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>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <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>
         <source>&amp;Import text file</source>
         <translation>Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
         <translation>Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
         <translation>&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation 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>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation 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>
         <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
         <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
         <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
         <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
         <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
         <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
         <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
         <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
         <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
         <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
         <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
         <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
         <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
         <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
         <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
         <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
-        <source>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>
         <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No document defined.
 You have to create a new document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to save </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 before continuing?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Now you have to enter
 a password twice for your
 newly created document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&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>
         <source>&lt;P&gt;You must create a new document first. Ok to create?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Password Manager&lt;br&gt;ZSafe version 2.1.2&lt;br&gt;&lt;/b&gt;by Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Translations by Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,570 +1,490 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation>Nome Completo</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Contatto</translation>
     </message>
     <message>
         <source>Pick</source>
         <translation>Scelta</translation>
     </message>
 </context>
 <context>
     <name>AbView</name>
     <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>
         <source>Unable to find a contact for this search pattern!</source>
         <translation>Impossibile trovare un contatto con questo 
  criterio di ricerca!</translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation>Il nome del file selezionato 
  non termina con &quot;.vcf&quot;.
  Vuoi veramente aprirlo?</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>Aggiungi Contatto?</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>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation>Stile Ricerca</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>Usa Espressioni Regolari</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>Usa Wildcards (*,?)</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Maiuscole/minuscole</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Email</translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation>Scegli QT-Mail </translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation>Scegli Opie-Mail</translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation>Nota: QT-Mail è inserito 
 nella ROM della SHARP. 
 Opie-Mail viene invece
 rilasciato gratuitamente!</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Varie</translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation>Impostazioni Ricerca</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Piccolo</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normale</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Grande</translation>
     </message>
     <message>
         <source>Order</source>
         <translation>Ordine</translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation>Seleziona Ordine Visualizzazione:</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Sù</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Giù</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Aggiungi</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Elimina</translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation>Configurazione</translation>
     </message>
     <message>
         <source>Click on tab to select one</source>
         <translation>Premi sul tab per selezionarne uno</translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation>Impostazioni per lo stile della ricerca</translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation>Il widget Cerca si aspetta, se selezionate, espressioni regolari</translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
         <translation>Il widget Cerca si aspetta solo semplici wildcards</translation>
     </message>
     <message>
         <source>If selected, search differs between upper and lower chars</source>
         <translation>Se selezionato, cerca differenze tra caratteri in minuscolo e maiuscolo</translation>
     </message>
     <message>
         <source>Font size for list- and card view</source>
         <translation>Dimensione Font size per vista della lista e della card</translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
         <translation>Impostazioni Font per vista della lista e della card</translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation>Utilizza il client mail della Sharp se disponibile</translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</source>
         <translation>Utilizza il client mail di OPIE se installato</translation>
     </message>
     <message>
         <source>Move selected attribute one line up</source>
         <translation>Sposta l&apos;attributo selezionato una riga sopra</translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation>Sposta l&apos;attributo selezionato una riga sotto</translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation>Mostra tutti gli attributi disponibili</translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation>Aggiungi l&apos;attributo selezionato dalla lista inferiore alla lista di superiore</translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation>Elimina l&apos;attributo selezionato dalla lista superiore</translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation>Ordine (sopra -&gt; sotto) definisce la visualizzazione dei contatti principali nella seconda colonna della vista</translation>
     </message>
     <message>
         <source>Tool-/Menubar</source>
         <translation>Tool-/Menubar</translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation>Fisso</translation>
     </message>
     <message>
         <source>Switch to fixed menu-/toolbars after restarting application !</source>
         <translation>Cambia su menu-/toolbar fissi dopo aver riavviato l&apos;applicazione !</translation>
     </message>
     <message>
         <source>Moveable</source>
         <translation>Mobile</translation>
     </message>
     <message>
         <source>Switch to moveable menu-/toolbars after restarting application !</source>
         <translation>Cambia su menu-/toolbar mobili dopo aver riavviato l&apos;applicazione !</translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>First Name</source>
         <translation>Nome</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Secondo Nome</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Cognome</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Suffisso</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Visualizza come</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Sesso</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Titolo</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Organizzazione</translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation>Nome Completo...</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Categoria</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Note...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Generale</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Lavoro</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Abitazione</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Indirizzo</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Città</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Stato</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>CAP</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>Paese</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>Stati Uniti</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Regno Unito</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation>Albania</translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation>Algeria</translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation>Samoa Americana</translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation>Andorra</translation>
     </message>
     <message>
         <source>Angola</source>
         <translation>Angola</translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation>Anguilla</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>Argentina</translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation>Aruba</translation>
     </message>
     <message>
         <source>Australia</source>
         <translation>Australia</translation>
     </message>
     <message>
         <source>Austria</source>
         <translation>Austria</translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation>Azerbaijan</translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation>Bahamas</translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation>Bahrain</translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation>Bangladesh</translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation>Barbados</translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation>Belarus</translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation>Belgio</translation>
     </message>
     <message>
         <source>Belize</source>
         <translation>Belize</translation>
     </message>
     <message>
         <source>Benin</source>
         <translation>Benin</translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation>Bermuda</translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation>Bhutan</translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation>Botswana</translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation>Bouvet Island</translation>
     </message>
     <message>
         <source>Brazil</source>
         <translation>Brasile</translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
         <translation>Brunei Darussalam</translation>
     </message>
     <message>
         <source>Bulgaria</source>
         <translation>Bulgaria</translation>
     </message>
     <message>
         <source>Burkina Faso</source>
         <translation>Burkina Faso</translation>
     </message>
     <message>
         <source>Burundi</source>
         <translation>Burundi</translation>
     </message>
     <message>
@@ -1014,552 +934,385 @@ rilasciato gratuitamente!</translation>
     <message>
         <source>Peru</source>
         <translation>Perù</translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation>Filippine</translation>
     </message>
     <message>
         <source>Poland</source>
         <translation>Polonia</translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation>Portogallo</translation>
     </message>
     <message>
         <source>Puerto Rico</source>
         <translation>Porto Rico</translation>
     </message>
     <message>
         <source>Qatar</source>
         <translation>Qatar</translation>
     </message>
     <message>
         <source>Reunion</source>
         <translation>Reunion</translation>
     </message>
     <message>
         <source>Romania</source>
         <translation>Romania</translation>
     </message>
     <message>
         <source>Russia</source>
         <translation>Russia</translation>
     </message>
     <message>
         <source>Rwanda</source>
         <translation>Rwanda</translation>
     </message>
     <message>
         <source>Saint Lucia</source>
         <translation>Santa Lucia</translation>
     </message>
     <message>
         <source>Samoa</source>
         <translation>Samoa</translation>
     </message>
     <message>
         <source>San Marino</source>
         <translation>San Marino</translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
         <translation>Arabia Saudita</translation>
     </message>
     <message>
         <source>Senegal</source>
         <translation>Senegal</translation>
     </message>
     <message>
         <source>Seychelles</source>
         <translation>Seychelles</translation>
     </message>
     <message>
         <source>Sierra Leone</source>
         <translation>Sierra Leone</translation>
     </message>
     <message>
         <source>Singapore</source>
         <translation>Singapore</translation>
     </message>
     <message>
         <source>Slovakia</source>
         <translation>Slovacchia</translation>
     </message>
     <message>
         <source>Slovenia</source>
         <translation>Slovenia</translation>
     </message>
     <message>
         <source>Solomon Islands</source>
         <translation>Isole Salomone</translation>
     </message>
     <message>
         <source>Somalia</source>
         <translation>Somalia</translation>
     </message>
     <message>
         <source>South Africa</source>
         <translation>Sud Africa</translation>
     </message>
     <message>
         <source>Spain</source>
         <translation>Spagna</translation>
     </message>
     <message>
         <source>Sri Lanka</source>
         <translation>Sri Lanka</translation>
     </message>
     <message>
         <source>St. Helena</source>
         <translation>St. Helena</translation>
     </message>
     <message>
         <source>Sudan</source>
         <translation>Sudan</translation>
     </message>
     <message>
         <source>Suriname</source>
         <translation>Suriname</translation>
     </message>
     <message>
         <source>Swaziland</source>
         <translation>Swaziland</translation>
     </message>
     <message>
         <source>Sweden</source>
         <translation>Svezia</translation>
     </message>
     <message>
         <source>Switzerland</source>
         <translation>Svizzera</translation>
     </message>
     <message>
         <source>Taiwan</source>
         <translation>Taiwan</translation>
     </message>
     <message>
         <source>Tajikistan</source>
         <translation>Tajikistan</translation>
     </message>
     <message>
         <source>Tanzania</source>
         <translation>Tanzania</translation>
     </message>
     <message>
         <source>Thailand</source>
         <translation>Tailandia</translation>
     </message>
     <message>
         <source>Togo</source>
         <translation>Togo</translation>
     </message>
     <message>
         <source>Tokelau</source>
         <translation>Tokelau</translation>
     </message>
     <message>
         <source>Tonga</source>
         <translation>Tonga</translation>
     </message>
     <message>
         <source>Tunisia</source>
         <translation>Tunisia</translation>
     </message>
     <message>
         <source>Turkey</source>
         <translation>Turchia</translation>
     </message>
     <message>
         <source>Turkmenistan</source>
         <translation>Turkmenistan</translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation>Tuvalu</translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation>Uganda</translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation>Ucraina</translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation>Uruguay</translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation>Uzbekistan</translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation>Vanuatu</translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation>Venezuela</translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation>Isole Vergini</translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation>Western Sahara</translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation>Yemen</translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation>Yugoslavia</translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation>Zambia</translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation>Zimbabwe</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Maschile</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Femminile</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Dettagli</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>Inserisci Note</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>Modifica Nome</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Compleanno</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Anniversario</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Contatti</translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation>Kuwait</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Sconosciuto</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Elimina</translation>
     </message>
     <message>
         <source>Afghanistan</source>
         <translation>Afghanistan</translation>
     </message>
     <message>
         <source>Antarctica</source>
         <translation>Antarctica</translation>
     </message>
     <message>
         <source>Armenia</source>
         <translation>Armenia</translation>
     </message>
     <message>
         <source>Bolivia</source>
         <translation>Bolivia</translation>
     </message>
     <message>
         <source>Cameroon</source>
         <translation>Cameroon</translation>
     </message>
     <message>
         <source>Ghana</source>
         <translation>Ghana</translation>
     </message>
     <message>
         <source>Guadeloupe</source>
         <translation>Guadalupe</translation>
     </message>
     <message>
         <source>Guinea-Bissau</source>
         <translation>Guinea-Bissau</translation>
     </message>
     <message>
         <source>Jamaica</source>
         <translation>Jamaica</translation>
     </message>
     <message>
         <source>Kiribati</source>
         <translation>Kiribati</translation>
     </message>
     <message>
         <source>Kyrgyzstan</source>
         <translation>Kyrgyzstan</translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
         <translation>Palestinian Sovereign Areas</translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
         <translation>Isole Pitcairn</translation>
     </message>
     <message>
         <source>Vietnam</source>
         <translation>Vietnam</translation>
     </message>
     <message>
         <source>Press to enter last- middle and firstname</source>
         <translation>Premi pre inserire cognome e nome</translation>
     </message>
     <message>
         <source>Enter fullname directly ! If you have a lastname with multiple words ( for instance &quot;de la Guerra&quot;), please write &lt;lastname&gt;,&lt;firstnames&gt; like this: &quot;de la Guerra, Carlos Pedro&quot;</source>
         <translation>Inserisci il nome completo direttamente ! Se hai un cognome con più parole (per esempio &quot;di Filippo&quot;), scrivi per favore &lt;cognome&gt;,&lt;nomi&gt; come: &quot;di Filippo, Francesco&quot;</translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation>Titolo..</translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation>Qualcosa come &quot;jr.&quot;..</translation>
     </message>
     <message>
         <source>The working place of the contact</source>
         <translation>Il posto di lavoro del contatto</translation>
     </message>
     <message>
         <source>Press to select attribute to change</source>
         <translation>Premi per selezionare l&apos;attributo da cambiare</translation>
     </message>
     <message>
         <source>Press to select how to store the name (and howto show it in the listview)</source>
         <translation>Premi per selezionare come registrare il nome (e come visualizzarlo nella vista)</translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie</name>
     <message>
         <source>Contact</source>
         <translation type="unfinished">Contatto</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation type="unfinished">Contatti</translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation type="unfinished">Inizia Ricerca</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation type="unfinished">Scrivi Email A</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation type="unfinished">Importa vCard</translation>
     </message>
     <message>
         <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,454 +1,362 @@
 <!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>
         <source>Actions</source>
         <translation>Azioni</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>Crea Directory</translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation>Crea Link Simbolico</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Rinomina</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copia</translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation>Copia Come</translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation>Copia Stessa Dir</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>Muovi</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Cancella</translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation>Aggiungi a Documenti</translation>
     </message>
     <message>
         <source>Run Command</source>
         <translation>Esegui Comando</translation>
     </message>
     <message>
         <source>File Info</source>
         <translation>Info File</translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation>Imposta Permessi</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Proprietà</translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation>Trasmetti File via IrDA</translation>
     </message>
     <message>
         <source>AdvancedFm</source>
         <translation>AdvancedFm</translation>
     </message>
     <message>
         <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>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <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>
         <source>Switch to View 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not Yet Implemented</source>
         <translation type="unfinished"></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>
         <source>Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1 files?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1 and all it&apos;s contents?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really copy %1 files?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 already  exists. Ok to overwrite?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Could not copy %1 to %2&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy %1 As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt; %1 already exists. Ok to overwrite?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not copy %1 to %2&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt; %1 already exists. Do you really want to delete it?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not move %1&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not copy %1 to %2&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Salva output su file (solo nome)</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Output</translation>
     </message>
     <message>
         <source>Process could not start</source>
         <translation>Il processo non può essere iniziato</translation>
     </message>
     <message>
         <source>Error
 </source>
         <translation>Errore
 </translation>
     </message>
     <message>
         <source>
 Finished
 </source>
         <translation>
 Terminato
 </translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Imposta Permessi File</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Imposta permessi file per:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>proprietario</translation>
     </message>
     <message>
         <source>group</source>
         <translation>gruppo</translation>
     </message>
     <message>
         <source>others</source>
         <translation>altri</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Proprietario</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Gruppo</translation>
     </message>
     <message>
         <source>read</source>
         <translation>lettura</translation>
     </message>
     <message>
         <source>write</source>
         <translation>scrittura</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>esecuzione</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Attenzione</translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation>Errore- nessun utente</translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation>Errore- nessun gruppo</translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation>Errore impostazioni proprietà utente o gruppo</translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation>Errore impostazioni permessi</translation>
     </message>
     <message>
         <source>filePermissions</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,294 +1,234 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Appearance</name>
     <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>Gli stili controllano il modo in cui gli elementi come i pulsanti e le barre di scorrimento appaiono in tutte le applicazioni.
 
 Premi qui per selezionare uno stile disponibile.</translation>
     </message>
     <message>
         <source>Settings...</source>
         <translation>Impostazioni...</translation>
     </message>
     <message>
         <source>Click here to configure the currently selected style.
 
 Note:  This option is not available for all styles.</source>
         <translation>Premi qui per configurare lo stile selezionato.
 
 Nota:  Questa opzione non è disponibile per tutti gli stili.</translation>
     </message>
     <message>
         <source>Window decorations control the way the application title bar and its buttons appear.
 
 Click here to select an available decoration.</source>
         <translation>Le decorazioni delle finestre controllano il modo in cui la barra del titolo e i pulsanti dell&apos;applicazione appaiono.
 
 Premi qui per selezionare una decorazione disponibile.</translation>
     </message>
     <message>
         <source>Select the desired name, style and size of the default font applications will use.</source>
         <translation>Seleziona il nome desiderato, stile e dimensione del font predefinito che le applicazioni utilizzeranno.</translation>
     </message>
     <message>
         <source>Color schemes are a collection of colors which are used for various parts of the display.
 
 Click here to select an available scheme.</source>
         <translation>Gli schemi dei colori sono collezioni di colori che sono utilizzate da varie parti del display.
 
 Premi qui per selezionare uno schema disponibile.</translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation>Schema Corrente</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>Modifica...</translation>
     </message>
     <message>
         <source>Click here to change the colors in the current color scheme.</source>
         <translation>Premi qui per cambiare i colori nello schema corrente.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Elimina</translation>
     </message>
     <message>
         <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:
 
 1. Tab - tab normali solo con etichette di testo
 2. Tabs + icone - tab con icone per ogni tab, etichette di testo appaiono solo sul tab selezionato
 3. Lista verticale - una lista di tab in verticale
 4. Lista verticale + icone - una lista di tab in verticale con icone</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Tab</translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
         <translation>Tab + icone</translation>
     </message>
     <message>
         <source>Drop down list</source>
         <translation>Lista verticale</translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation>Lista verticale + icone</translation>
     </message>
     <message>
         <source>Top</source>
         <translation>In Alto</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation>Premi qui per far apparire i tab in cima alla finestra.</translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation>In Basso</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation>Premi qui per far apparire i tab in fondo alla finestra.</translation>
     </message>
     <message>
         <source>Rotation direction:</source>
         <translation>Direzione rotazione:</translation>
     </message>
     <message>
         <source>Appearance Settings</source>
         <translation>Impostazioni Aspetto</translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation>Questa è un&apos;anteprima.  Controlla qui il nuovo aspetto una volta modificate le opzioni.</translation>
     </message>
     <message>
         <source>Style</source>
         <translation>Stile</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Colori</translation>
     </message>
     <message>
         <source>Windows</source>
         <translation>Finestre</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Avanzato</translation>
     </message>
     <message>
-        <source>Restart</source>
-        <translation 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>
         <translation>Modifica schema</translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation>Premi qui per selezionare un colore per: </translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
         <translation>Esempio</translation>
     </message>
     <message>
         <source>Normal Item</source>
         <translation>Elemento Normale</translation>
     </message>
     <message>
         <source>Disabled Item</source>
         <translation>Elemento Disabilitato</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Menu</translation>
     </message>
     <message>
         <source>Normal Text</source>
         <translation>Testo Normale</translation>
     </message>
     <message>
         <source>Highlighted Text</source>
         <translation>Testo Evidenziato</translation>
     </message>
     <message>
         <source>Button</source>
         <translation>Pulsante</translation>
     </message>
     <message>
         <source>Check Box</source>
         <translation>Check Box</translation>
     </message>
     <message>
         <source>Sample window using the selected settings.</source>
         <translation>Finestra d&apos;esempio con le impostazioni selezionate.</translation>
     </message>
 </context>
 </TS>
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
@@ -1,712 +1,672 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation>Filtro Categoria</translation>
     </message>
     <message>
         <source>Select one or more groups</source>
         <translation>Seleziona uno o più gruppi</translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation>Lettura configurazione...</translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancella</translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
         <translation>Chiudi</translation>
     </message>
     <message>
         <source>Remove
 </source>
         <translation>Elimina
 </translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation>Installa
 </translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation>Upgrade
 </translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation>(Rinstalla)</translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation>(Upgrade)</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation>Destinazione</translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation>Spazio Disp.</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Output</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Inizia</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opzioni</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tutti</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Testo</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation>Interrompi</translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation>
 **** L&apos;utente ha premuto INTERROMPI ***</translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation>**** Processo Interrotto ****</translation>
     </message>
     <message>
         <source>Save output</source>
         <translation>Salva output</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Sconosciuto</translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation>%1 Kb</translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation>Opzioni</translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation>Forza Dipendenze</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation>Forza Rinstallazione</translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation>Forza Eliminazione</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation>Forza Sovrascrittura</translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation>Livello Informazioni</translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation>Solo errori</translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation>Messaggi normali</translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation>Messaggi informativi</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation>Output troubleshooting</translation>
     </message>
 </context>
 <context>
     <name>Ipkg</name>
     <message>
         <source>Dealing with package %1</source>
         <translation>Trattamento pacchetto %1</translation>
     </message>
     <message>
         <source>Removing symbolic links...
 </source>
         <translation>Rimozione link simbolici...
 </translation>
     </message>
     <message>
         <source>Creating symbolic links for %1.</source>
         <translation>Creazione link simbolici per %1.</translation>
     </message>
     <message>
         <source>Creating symbolic links for %1</source>
         <translation>Creazione link simbolici per %1</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>Terminato</translation>
     </message>
     <message>
         <source>Removing status entry...</source>
         <translation>Rimozione valore stato...</translation>
     </message>
     <message>
         <source>status file - </source>
         <translation>file di stato - </translation>
     </message>
     <message>
         <source>package - </source>
         <translation>pacchetto - </translation>
     </message>
     <message>
         <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>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation>AQPkg - Gestore Pacchetti</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation>Inserisci qui il testo da cercare.</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation>Premi qui per nascondere la toolbar &quot;Quick Jump&quot;.</translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation>Aggiorna liste</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation>Premi qui per aggiornare le liste dei pacchetti dai server.</translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation>Upgrade</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation>Premi qui per fare l&apos;upgrade di tutti i pacchetti installati se è disponibile una versione più aggiornata.</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Download</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation>Premi qui per fare il download dei pacchetti selezionati.</translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation>Applica modifiche</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation>Premi qui per installare, eliminare o fare l&apos;upgrade dei pacchetti selezionati.</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Azioni</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation>Mostra pacchetti non installati</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation>Premi qui per visualizzare i pacchetti disponibili non ancora installati.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation>Mostra pacchetti installati</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation>Premi qui per visualizzare i pacchetti installati su questo dispositivo.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation>Mostra pacchetti aggiornati</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation>Premi qui per visualizzare i pacchetti installati su questo dispositivo che hanno disponibile una versione più aggiornata.</translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation>Filtra per categoria</translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation>Premi qui per visualizzare i pacchetti appartenenti ad una categoria.</translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation>Imposta filtro per categoria</translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation>Premi qui per cambiare la categoria utilizzata per il filtro dei pacchetti.</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Trova</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation>Premi qui per cercare del testo nei nomi dei pacchetti.</translation>
     </message>
     <message>
         <source>Find next</source>
         <translation>Trova successivo</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation>Premi qui per trovare il successivo nome del pacchetto che contiene il testo che stai cercando.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation>Tastiera Quick Jump</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation>Premi qui per mostrare/nascondere la tastiera per muoversi velocemente nella lista dei pacchetti.</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Vista</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Configura</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation>Premi qui per configurare questa applicazione.</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation>Premi qui per nascondere la toolbar di ricerca.</translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation>Server:</translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation>Premi qui per selezionare un server per i pacchetti.</translation>
     </message>
     <message>
         <source>Packages</source>
         <translation>Pacchetti</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 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>Questa è la lista di tutti i pacchetti del server selezionato sopra.
 
 Un punto blu dopo il nome del pacchetto indica che il pacchetto è installato.
 
 Un punto blu con una stella indica che è disponibile sul server una nuova versione del pacchetto .
 
 Premi dentro il box sulla sinistra per selezionare un pacchetto.</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Elimina</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation>Premi qui per disinstallare i pacchetti selezionati.</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation>Creazione lista server:
 <byte value="x9"/>%1</translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation>Creazione lista pacchetti per:
 <byte value="x9"/>%1</translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
         <translation>Aggiornamento liste pacchetti dal server</translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation>ATTENZIONE: Fare l&apos;upgrade
 mentre Opie/Qtopia è in esecuzione
 è SCONSIGLIATO!
 
 Sei sicuro?
 </translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Attenzione</translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
         <translation>Aggiornamento pacchetti installati</translation>
     </message>
     <message>
         <source>Are you sure you wish to delete
 %1?</source>
         <translation>Sei sicuro di voler eliminare
 %1?</translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation>Sei sicuro?</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sì</translation>
     </message>
     <message>
         <source>Download to where</source>
         <translation>Download su dove</translation>
     </message>
     <message>
         <source>Enter path to download to</source>
         <translation>Inserisci path per download su</translation>
     </message>
     <message>
         <source>Install Remote Package</source>
         <translation>Installa Pacchetto Remoto</translation>
     </message>
     <message>
         <source>Enter package location</source>
         <translation>Inserisci posizione pacchetto</translation>
     </message>
     <message>
         <source>Nothing to do</source>
         <translation>Niente da fare</translation>
     </message>
     <message>
         <source>No packages selected</source>
         <translation>Nessun pacchetto selezionato</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Do you wish to remove or reinstall
 %1?</source>
         <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>
         <translation>&lt;p&gt;&lt;b&gt;Installato Su&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Dimensione&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Sezione&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Versione Installata&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Versione Disponibile&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>Package Information</source>
         <translation>Informazioni Pacchetto</translation>
     </message>
     <message>
         <source>Package information is unavailable</source>
         <translation>Informazioni pacchetto non disponibili</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Chiudi</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Installed packages</source>
         <translation>Pacchetti installati</translation>
     </message>
     <message>
         <source>Local packages</source>
         <translation>Pacchetti locali</translation>
     </message>
     <message>
         <source>N/A</source>
         <translation>N/D</translation>
     </message>
     <message>
         <source>Package - %1
               version - %2</source>
         <translation>Pacchetto - %1
               versione - %2</translation>
     </message>
     <message>
         <source>
               inst version - %1</source>
         <translation>
               versione inst - %1</translation>
     </message>
     <message>
         <source>Version string is empty.</source>
         <translation>La stringa della versione è vuota.</translation>
     </message>
     <message>
         <source>Epoch in version is not number.</source>
         <translation>Il valore nella versione non è un numero.</translation>
     </message>
     <message>
         <source>Nothing after colon in version number.</source>
         <translation>Nessun carattere dopo i due punti nel numero di versione.</translation>
     </message>
 </context>
 <context>
     <name>QuestionDlg</name>
     <message>
         <source>Remove</source>
         <translation>Elimina</translation>
     </message>
 </context>
 <context>
     <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation>Configurazione</translation>
     </message>
     <message>
         <source>Servers</source>
         <translation>Server</translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation>Destinazioni</translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation>Proxy</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuovo</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Elimina</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
     <message>
         <source>Address:</source>
         <translation>Indirizzo:</translation>
     </message>
     <message>
         <source>Active Server</source>
         <translation>Server Attivo</translation>
     </message>
     <message>
         <source>Update</source>
         <translation>Aggiorna</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation>Destinazione</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Ubicazione:</translation>
     </message>
     <message>
         <source>Link to root</source>
         <translation>Link a /</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
         <translation>Proxy HTTP</translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation>Abilitato</translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation>Proxy FTP</translation>
     </message>
     <message>
         <source>Username:</source>
         <translation>Username:</translation>
     </message>
     <message>
         <source>Password:</source>
         <translation>Password:</translation>
     </message>
 </context>
 </TS>
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,170 +1,150 @@
 <!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>
     </message>
     <message>
         <source>Backup Failed!</source>
         <translation>Backup Fallito!</translation>
     </message>
     <message>
         <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>
         <source>Restore Backup...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;%1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore</source>
         <translation type="unfinished">Restore</translation>
     </message>
     <message>
         <source>Would you really overwrite your local data?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <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>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ErrorDialog</name>
     <message>
         <source>Error Info</source>
         <translation>Info Errore</translation>
     </message>
     <message>
         <source>Error Message:</source>
         <translation>Messaggio di Errore:</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
 </context>
 </TS>
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,339 +1,331 @@
 <!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>
         <source>CE</source>
         <translation>C</translation>
     </message>
     <message>
         <source>log</source>
         <translation>log</translation>
     </message>
     <message>
         <source>ln</source>
         <translation>ln</translation>
     </message>
     <message>
         <source>(</source>
         <translation>(</translation>
     </message>
     <message>
         <source>)</source>
         <translation>)</translation>
     </message>
     <message>
         <source>sin</source>
         <translation>sin</translation>
     </message>
     <message>
         <source>cos</source>
         <translation>cos</translation>
     </message>
     <message>
         <source>tan</source>
         <translation>tan</translation>
     </message>
     <message>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
         <source>+/-</source>
         <translation>+/-</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>=</source>
         <translation>=</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>.</source>
         <translation>.</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <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>
         <source>Distance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>acres</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&#xb0;C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>carats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&#xb0;F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>fl oz (US)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>g</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>gal (US)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>hectares</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>km</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>l</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>lb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lg tons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ml</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>naut. mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>oz</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>pt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>qt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq km</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq yd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>St tons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tblspoon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>teaspoons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tonnes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>yd</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,755 +1,647 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation>Nota Spese</translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation>Nuova nota spese</translation>
     </message>
     <message>
         <source>Info</source>
         <translation>Informazioni</translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation>Movimenti</translation>
     </message>
     <message>
         <source>Charts</source>
         <translation>Grafici</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation>Inserisci qui il nome della nota spese.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation>Seleziona qui il tipo di nota spese.</translation>
     </message>
     <message>
-        <source>Savings</source>
-        <translation 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>
         <source>Enter account number for this checkbook here.</source>
         <translation>Inserisci qui il numero di conto per questa nota spese.</translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation>Numero PIN:</translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation>Inserisci qui il numero PIN per questa nota spese.</translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation>Saldo iniziale:</translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation>Inserisci qui il saldo iniziale per questa nota spese.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Note:</translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation>Inserisci qui ulteriori informazioni necessarie per questa nota spese.</translation>
     </message>
     <message>
-        <source>Current balance: %10.00</source>
-        <translation 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>
         <source>Description</source>
         <translation>Descrizione</translation>
     </message>
     <message>
         <source>Amount</source>
         <translation>Importo</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuovo</translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation>Premi qui per aggiungere un nuovo movimento.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Modifica</translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation>Seleziona un movimento e Premi qui per modificarlo.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Elimina</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation>Seleziona una nota spese e Premi qui per eliminarla.</translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation>Seleziona il grafico desiderato e Premi sul pulsante Disegna.</translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation>Premi qui per selezionare il tipo di grafico desiderato.</translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation>Saldo del conto</translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation>Prelievi per categoria</translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation>Depositi per categoria</translation>
     </message>
     <message>
         <source>Draw</source>
         <translation>Disegna</translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation>Premi qui per disegnare il grafico selezionato.</translation>
     </message>
     <message>
-        <source>Current balance: %1%2</source>
-        <translation type="obsolete">Saldo: %1%2</translation>
-    </message>
-    <message>
         <source>Delete transaction</source>
         <translation>Elimina movimento</translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation>Protetta da password</translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation>Premi qui per abilitare/disabilitare la protezione con password per questa nota spese.</translation>
     </message>
     <message>
         <source>Num</source>
         <translation>Num</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Inserisci password</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Prego inserisci la tua password:</translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation>Conferma password</translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation>Prego conferma la tua password:</translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation>Prego inserisci la tua password per confermare l&apos;eliminazione della protezione con password:</translation>
     </message>
     <message>
         <source>Sort by:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select checkbook sorting here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entry Order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SortDate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Balance</source>
         <translation type="unfinished">Saldo</translation>
     </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation>Configura Nota Spese</translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation>Inserisci simbolo valuta:</translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation>Inserisci qui il tuo simbolo valuta.</translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation>Mostra quando una nota spese è protetta
 da password</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
         <translation>Premi qui per selezionare se nella finestra principale verrà o no mostrato se la nota spese è protetta da password.</translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation>Mostra i saldi delle note spese</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation>Premi qui per selezionare se nella finestra principale verranno o no mostrati i saldi di ogni nota spese.</translation>
     </message>
     <message>
         <source>&amp;Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Account Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Account Types</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Payees</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open last checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether the last open checkbook will be opened at startup.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show last checkbook tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save new description as payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to save new descriptions in the list of payess.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ListEdit</name>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Elimina</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation>Nota Spese</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuova</translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation>Premi per creare una nuova nota spese.
 
 Puoi anche selezionare Nuova dal menu.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Modifica</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation>Seleziona una nota spese e Premi qui per modificarla.
 
 Puoi anche selezionare Modifica dal menu, o Premi e tieni premuto sul nome della nota spese.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Elimina</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation>Seleziona un movimento e Premi qui per eliminarlo.
 
 Puoi anche selezionare Elimina dal menu.</translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation>Questa è la lista di tutte le note spese attualmente disponibili.</translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation>Elimina nota spese</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Configura</translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation>Premi qui per configurare questa applicazione.</translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation>Nome Nota Spese</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>Saldo</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Inserisci password</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Prego inserisci la tua password:</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>Date</source>
         <translation type="unfinished">Data</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Modifica</translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Elimina</translation>
     </message>
     <message>
         <source>Savings</source>
         <translation type="unfinished">Risparmio</translation>
     </message>
     <message>
         <source>Checking</source>
         <translation type="unfinished">Deposito</translation>
     </message>
     <message>
         <source>CD</source>
         <translation type="unfinished">CD</translation>
     </message>
     <message>
         <source>Money market</source>
         <translation type="unfinished">Mercato finanziario</translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation type="unfinished">Mutuo</translation>
     </message>
     <message>
         <source>Other</source>
         <translation type="unfinished">Altro</translation>
     </message>
     <message>
         <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation type="unfinished">Automobile</translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="unfinished">Conti</translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="unfinished">CD</translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="unfinished">Vestiti</translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="unfinished">Computer</translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="unfinished">DVD</translation>
     </message>
     <message>
         <source>Electronics</source>
         <translation type="unfinished">Elettronica</translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation type="unfinished">Intrattenimento</translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="unfinished">Cibo</translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="unfinished">Carburante</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished">Varie</translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="unfinished">Film</translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="unfinished">Affitto</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished">Viaggio</translation>
     </message>
     <message>
         <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished">Lavoro</translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation type="unfinished">Parente</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation type="unfinished">Spese Varie</translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation>Movimento per </translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation>Prelievo</translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation>Seleziona qui se il movimento è un prelievo o un deposito.</translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation>Deposito</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Data:</translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation>Seleziona qui la data del movimento.</translation>
     </message>
     <message>
         <source>Number:</source>
         <translation>Numero:</translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation>Inserisci qui il numero del conto.</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Descrizione:</translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation>Inserisci qui la descrizione del movimento.</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoria:</translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation>Seleziona qui la categoria del movimento.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation>Seleziona qui il tipo di movimento.
 
 Le opzioni disponibili variano a seconda se il movimento è un deposito o un prelievo.</translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation>Importo:</translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation>Inserisci qui l&apos;importo del movimento.
 
 Il valore inserito deve essere sempre positivo.</translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation>Tassa:</translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation>Inserisci ogni tassa associata a questo movimento.
 
 Il valore inserito deve essere sempre positivo.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Note:</translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation>Inserisci qui ogni altra informazione per questo movimento.</translation>
     </message>
     <message>
-        <source>Automobile</source>
-        <translation 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
@@ -1,289 +1,207 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AlarmDlg</name>
     <message>
         <source>Clock</source>
         <translation type="unfinished">Orologio</translation>
     </message>
     <message>
         <source>Snooze</source>
         <translation type="unfinished">Snooze</translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AlarmDlgBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>TextLabel1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Snooze</source>
         <translation type="unfinished">Snooze</translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thu</source>
         <comment>Thursday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fri</source>
         <comment>Friday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat</source>
         <comment>Saturday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sun</source>
         <comment>Sunday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lap/Split</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Daily Alarm:&lt;/b&gt;&lt;p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily alarm requires at least
 one day to be selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished">Tutti</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished">Audio</translation>
     </message>
 </context>
 <context>
     <name>ClockBase</name>
     <message>
         <source>Clock</source>
         <translation type="unfinished">Orologio</translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stopwatch</source>
         <translation type="unfinished">Cronografo</translation>
     </message>
     <message>
         <source>Split</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished">Inizia</translation>
     </message>
     <message>
         <source>Starts and stops the stopwatch.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lap/Split</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Resets the stopwatch.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check to enable the daily alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the hour the alarm will sound.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the minute the alarm will sound.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished">AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished">PM</translation>
     </message>
     <message>
         <source>Days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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
@@ -1,861 +1,830 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation>Agenda</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuovo</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>Oggi</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Giorno</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Settimana</translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation>Lista Settimana</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mese</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Trova</translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation>La durata dell&apos;evento è probabilmente più
 lunga dell&apos;intervallo tra le ripetizioni.</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Impossibile modificare i dati, sincronizzazione in corso</translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation>Modifica Evento</translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation> minuti)</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Spazio esaurito</translation>
     </message>
     <message>
         <source>Calendar 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 riprovare.
 
 Uscire comunque?</translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation>(Sconosciuto)</translation>
     </message>
     <message>
         <source>Error!</source>
         <translation>Errore!</translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation>Ripara</translation>
     </message>
     <message>
         <source>Continue</source>
         <translation>Continua</translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation>Copia Evento</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>Modifica...</translation>
     </message>
     <message>
         <source>error box</source>
         <translation>box di errore</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation>L</translation>
     </message>
     <message>
         <source>T</source>
         <translation>M</translation>
     </message>
     <message>
         <source>W</source>
         <translation>M</translation>
     </message>
     <message>
         <source>F</source>
         <translation>V</translation>
     </message>
     <message>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Lunedì</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Martedì</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Mercoledì</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Giovedì</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Venerdì</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sabato</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Domenica</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00p</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Questo è un evento per tutto il giorno.</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Inizio</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Fine</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Modifica</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Elimina</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Trasmetti via IrDA</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Orario</translation>
     </message>
     <message>
         <source> - </source>
         <translation> - </translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Copia</translation>
     </message>
     <message>
         <source>Beam this occurence</source>
         <translation>Trasmetti questa occorrenza</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation>:00 PM</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation>:00 AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Agenda</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>Impostazioni</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation>Inizio visualizzazione eventi</translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation>Ora inizio:</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation>Impostazioni Allarme</translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation>Regolazione Allarme</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation> minuti</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Varie</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>Stile riga:</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Predefinito</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Medio</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Grande</translation>
     </message>
     <message>
         <source>Views</source>
         <translation>Viste</translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation>Vista predefinita:</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Giorno</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Settimana</translation>
     </message>
     <message>
         <source>Week List</source>
         <translation>Lista Settimana</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mese</translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation>Vai all&apos;orario corrente</translation>
     </message>
     <message>
         <source>Time display</source>
         <translation>Mostra orario</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nessuno</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Inizio</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation>Inizio-Fine</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Predefiniti</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Ubicazione:</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Ufficio</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Abitazione</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoria:</translation>
     </message>
+    <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>
         <translation>w</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Gen-00. Gen</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
         <translation type="unfinished">LMMGVSDL</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstEvent</name>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Modifica</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished">Copia</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Elimina</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished">Trasmetti via IrDA</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>w</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>S: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation>p</translation>
     </message>
-    <message>
-        <source>Mo</source>
-        <comment>Monday</comment>
-        <translation type="obsolete">Lun</translation>
-    </message>
-    <message>
-        <source>Tu</source>
-        <comment>Tuesday</comment>
-        <translation type="obsolete">Mar</translation>
-    </message>
-    <message>
-        <source>We</source>
-        <comment>Wednesday</comment>
-        <translation type="obsolete">Mer</translation>
-    </message>
-    <message>
-        <source>Th</source>
-        <comment>Thursday</comment>
-        <translation type="obsolete">Gio</translation>
-    </message>
-    <message>
-        <source>Fr</source>
-        <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>
         <source>Calendar</source>
         <translation>Agenda</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>Ripeti...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>Giornalmente...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>Settimanalmente...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>Mensilmente...</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>Annualmente...</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Mai...</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>Nuovo Evento</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Ubicazione</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Categoria</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Appuntamento</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Pranzo</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Cena</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Viaggio</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Descrizione</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Ufficio</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Abitazione</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>Inizio - Fine </translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>Gen 02 00</translation>
     </message>
     <message>
         <source>Start time</source>
         <translation type="unfinished">Ora inizio</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Tutto il giorno</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Fuso orario</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Allarme</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation> minuti</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Basso</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Alto</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Ripetuto</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Non Ripetere...</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Note...</translation>
     </message>
-    <message>
-        <source>Start Time</source>
-        <translation type="obsolete">Inizio</translation>
-    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Modifica Nota</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Pranzo</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Inizio</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Fine</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Ogni</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 ogni </translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>Il %1 ogni </translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>Il %1 %1 di ogni</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Ogni</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Lunedì</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Martedì</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Mercoledì</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Giovedì</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Venerdì</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sabato</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Domenica</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>°</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>°</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>°</translation>
     </message>
     <message>
         <source>th</source>
         <translation>°</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation>Non Ripetere</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>giorno(i)</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>settimana(e)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Ripeti Ogni</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Giorno</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>mese(i)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>anno(i)</translation>
     </message>
     <message>
         <source>days</source>
         <translation>giorni</translation>
     </message>
     <message>
         <source>day</source>
         <translation>giorno</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>settimana(e)</translation>
     </message>
     <message>
         <source>week</source>
         <translation>settimana</translation>
     </message>
     <message>
         <source>month</source>
         <translation>mese</translation>
     </message>
     <message>
         <source>year</source>
         <translation>anno</translation>
     </message>
     <message>
         <source> and </source>
         <translation> e </translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
 e </translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, e </translation>
     </message>
     <message>
         <source>on </source>
         <translation>su </translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Evento Ripetuto</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nessuno</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Giorno</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Settimana</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mese</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Anno</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Ogni:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Frequenza</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Fino Al:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Indefinitivamente</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Ripeti Ogni</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Lun</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Mar</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Mer</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Gio</translation>
     </message>
     <message>
         <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>Every</source>
         <translation>Ogni</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>WeekVar</translation>
     </message>
     <message>
         <source>months</source>
         <translation>mesi</translation>
     </message>
     <message>
         <source>years</source>
         <translation>anni</translation>
     </message>
 </context>
 </TS>
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,314 +1,250 @@
 <!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>
         <source>Cyan on White</source>
         <translation>Cyan su Bianco</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>Bianco su Cyan</translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation>Blu su Nero</translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation>Ambra su Nero</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation>Personalizzato</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Colori</translation>
     </message>
     <message>
-        <source>Font</source>
-        <translation 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>
         <source>Tab</source>
         <translation>Tab</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Sù</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Giù</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Incolla</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Modifica veloce</translation>
     </message>
     <message>
-        <source>Edit</source>
-        <translation 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>
         <source>ScrollBar</source>
         <translation>Barra di Scorrimento</translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation>Visualizza Lista Comandi</translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation>Nascondi Lista Comandi</translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation>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>
         <source>Hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Pink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pink on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>new session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sessions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To exit fullscreen, tap here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History Lines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konsole </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Selezione Comandi</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation>Inserisci comando</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation>Inserisci comando da aggiungere:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/fifteen.ts b/i18n/it/fifteen.ts
index c3cd912..17e2495 100644
--- a/i18n/it/fifteen.ts
+++ b/i18n/it/fifteen.ts
@@ -1,101 +1,97 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>FifteenConfigDialog</name>
     <message>
         <source>All Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select board background</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FifteenConfigDialogBase</name>
     <message>
         <source>Configure Fifteen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use a Custom Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Path:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Preview:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Grid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Rows:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
 <context>
     <name>PiecesTable</name>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Gioco del 15</translation>
     </message>
     <message>
         <source>Congratulations!
 You win the game!</source>
         <translation>Congratulazioni!
 Hai vinto la partita!</translation>
     </message>
     <message>
         <source>R&amp;andomize Pieces</source>
         <translation>R&amp;andomizza Pezzi</translation>
     </message>
     <message>
         <source>&amp;Reset Pieces</source>
         <translation>&amp;Reset Pezzi</translation>
     </message>
 </context>
 </TS>
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
@@ -1,222 +1,182 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>FormatterApp</name>
     <message>
         <source>Formatter</source>
         <translation>Formatter</translation>
     </message>
     <message>
         <source>Storage Type</source>
         <translation>Tipo Storage</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Formatter Output</source>
         <translation>Ouput Formatter</translation>
     </message>
     <message>
         <source>Trying to umount.</source>
         <translation>Tento di smontare.</translation>
     </message>
     <message>
         <source>umount failed!</source>
         <translation>umont fallito!</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
         <source>Could not umount.
 Device is busy!</source>
         <translation>Impossibile smontare.
 Device occupato!</translation>
     </message>
     <message>
         <source>Trying to format.</source>
         <translation>Tento di formattare.</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>
         <source>Available: %1 kB ( %d mB)</source>
         <translation>Disponibili: %1 kB ( %d mB)</translation>
     </message>
     <message>
         <source>CAUTION:
 Changing parameters on this
 page may cause your system
 to stop functioning properly!</source>
         <translation>ATTENZIONE:
 Cambiare i parametri su questa 
 pagina può causare il non corretto 
 funzionamento del sistema!</translation>
     </message>
     <message>
         <source>Format?</source>
         <translation>Formatto?</translation>
     </message>
     <message>
         <source>
 with %1 filesystem?
 You will loose all data!!</source>
         <translation>
 con il filesystem %1?
 Perderai tutti i dati!!</translation>
     </message>
     <message>
         <source>Trying to umount %1.</source>
         <translation>Tento di smontare %1.</translation>
     </message>
     <message>
         <source>Trying to mount %1.</source>
         <translation>Tento di montare %1.</translation>
     </message>
     <message>
         <source>%1
 has been successfully mounted.</source>
         <translation>%1
 è stato montato con successo.</translation>
     </message>
     <message>
         <source>Storage Type: %1</source>
         <translation>Tipo Storage: %1</translation>
     </message>
     <message>
         <source>Type: %1
 Formatted with %2
 %3, %4, %5</source>
         <translation>Tipo: %1
 Formattato con %2
 %3, %4, %5</translation>
     </message>
 </context>
 </TS>
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
@@ -1,57 +1,53 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>GoMainWidget</name>
     <message>
         <source>New Game</source>
         <translation>Nuova Partita</translation>
     </message>
     <message>
         <source>Pass</source>
         <translation>Passa</translation>
     </message>
     <message>
         <source>Resign</source>
         <translation>Abbandona</translation>
     </message>
     <message>
         <source>Two player option</source>
         <translation>Due giocatori</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Partita</translation>
     </message>
 </context>
 <context>
     <name>GoWidget</name>
     <message>
         <source>White %1, Black %2. </source>
         <translation>Bianco %1, Nero %2. </translation>
     </message>
     <message>
         <source>White wins.</source>
         <translation>Bianco vince.</translation>
     </message>
     <message>
         <source>Black wins.</source>
         <translation>Nero vince.</translation>
     </message>
     <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
@@ -1,69 +1,65 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>KBill</name>
     <message>
         <source>kBill</source>
         <translation></translation>
     </message>
     <message>
         <source>New game</source>
         <translation>Nuova partita</translation>
     </message>
     <message>
         <source>Pause game</source>
         <translation>Pausa</translation>
     </message>
     <message>
         <source>Story of kBill</source>
         <translation>Storia di kBill</translation>
     </message>
     <message>
         <source>Rules</source>
         <translation>Regole</translation>
     </message>
     <message>
         <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>
         <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 disguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>UI</name>
     <message>
         <source>After Level</source>
         <translation>Livello Successivo</translation>
     </message>
     <message>
         <source>Your score</source>
         <translation>Punti</translation>
     </message>
 </context>
 </TS>
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
@@ -1,297 +1,293 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>KRFBConnection</name>
     <message>
         <source>Connected</source>
         <translation>Connesso</translation>
     </message>
     <message>
         <source>Connection Refused</source>
         <translation>Connessione Rifiutata</translation>
     </message>
     <message>
         <source>Host not found</source>
         <translation>Host non trovato</translation>
     </message>
     <message>
         <source>Read Error: QSocket reported an error reading
 data, the remote host has probably dropped the
 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>
         <source>Protocol Error: An unknown encoding was used by the server %1</source>
         <translation>Errore di Protocollo: Il server %1 utilizza una codifica sconosciuta</translation>
     </message>
     <message>
         <source>Waiting for server initialization...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KRFBLogin</name>
     <message>
         <source>Waiting for server version...</source>
         <translation>In attesa della versione del server...</translation>
     </message>
     <message>
         <source>Error: Invalid server version, %1</source>
         <translation>Errore: Versione del server errata, %1</translation>
     </message>
     <message>
         <source>Error: Unsupported server version, %1</source>
         <translation>Errore: Versione del server non supportata, %1</translation>
     </message>
     <message>
         <source>Logged in</source>
         <translation>Autenticato</translation>
     </message>
     <message>
         <source>Error: This server requires a password, but none has been specified.
 </source>
         <translation>Errore: Il server richiede una password, però non è stata specificata.
 </translation>
     </message>
     <message>
         <source>Error: The password you specified was incorrect.</source>
         <translation>Errore: La password inserita non è corretta.</translation>
     </message>
     <message>
         <source>Error: Too many invalid login attempts have been made
 to this account, please try later.</source>
         <translation>Errore: Sono stati effettuati troppi tentativi di accesso non autorizzati
 per questo account, riprovare più tardi.</translation>
     </message>
     <message>
         <source>Login Failed</source>
         <translation>Autenticazione Fallita</translation>
     </message>
     <message>
         <source>Too many failures</source>
         <translation>Troppi tentativi falliti</translation>
     </message>
 </context>
 <context>
     <name>KVNC</name>
     <message>
         <source>VNC Viewer</source>
         <translation>VNC Viewer</translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation>Nuova Connessione</translation>
     </message>
     <message>
         <source>Open Bookmark</source>
         <translation>Apri Bookmark</translation>
     </message>
     <message>
         <source>Delete Bookmark</source>
         <translation>Cancella Bookmark</translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation>Schermo Intero</translation>
     </message>
     <message>
         <source>Send Contrl-Alt-Delete</source>
         <translation>Invia Ctrl-Alt-Canc</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>Disconnesso</translation>
     </message>
     <message>
         <source>Stop Full Screen</source>
         <translation>Chiudi Schermo Intero</translation>
     </message>
     <message>
         <source>Connected to remote host</source>
         <translation>Connesso al server remoto</translation>
     </message>
     <message>
         <source>Logged in to remote host</source>
         <translation>Autenticato sul server remoto</translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation>Connessione chiusa</translation>
     </message>
     <message>
         <source>Next Click is Double Click</source>
         <translation>Prossimo Click è un Doppio Click</translation>
     </message>
     <message>
         <source>Next Click is Right Click</source>
         <translation>Prossimo Click è un Click Destro</translation>
     </message>
 </context>
 <context>
     <name>KVNCBookmarkDlgBase</name>
     <message>
         <source>Bookmarks</source>
         <translation>Bookmark</translation>
     </message>
     <message>
         <source>Choose a bookmark that you would like to open</source>
         <translation>Scegli un bookmark che vorresti aprire</translation>
     </message>
 </context>
 <context>
     <name>KVNCConnDlgBase</name>
     <message>
         <source>VNC Viewer Connection</source>
         <translation>Connessione VNC Viewer</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
         <source>Show Password</source>
         <translation>Mostra Password</translation>
     </message>
     <message>
         <source>Password:</source>
         <translation>Password:</translation>
     </message>
     <message>
         <source>Bookmark Name:</source>
         <translation>Nome Bookmark:</translation>
     </message>
     <message>
         <source>Host Name:</source>
         <translation>Nome Server:</translation>
     </message>
     <message>
         <source>Display Number:</source>
         <translation>Numero Display:</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opzioni</translation>
     </message>
     <message>
         <source>Check for screen updates every:</source>
         <translation>Controlla aggiornamenti dello schermo ogni:</translation>
     </message>
     <message>
         <source>Milliseconds</source>
         <translation>Millisecondi</translation>
     </message>
     <message>
         <source>Request 8-bit session</source>
         <translation>Richiesta sessione a 8-bit</translation>
     </message>
     <message>
         <source>Raise on bell</source>
         <translation>Sveglia con sonoro</translation>
     </message>
     <message>
         <source>Request shared session</source>
         <translation>Richiesta sessione distribuita</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>Scale Factor</source>
         <translation>Fattore di Scala</translation>
     </message>
     <message>
         <source>Encodings</source>
         <translation>Codifiche</translation>
     </message>
     <message>
         <source>Hextile encoding</source>
         <translation>Codifica Hextile</translation>
     </message>
     <message>
         <source>CoRRE encoding</source>
         <translation>Codifica CoRRE</translation>
     </message>
     <message>
         <source>RRE encoding</source>
         <translation>Codifica RRE</translation>
     </message>
     <message>
         <source>Copy rectangle encoding</source>
         <translation>Copia codifica rettangolo</translation>
     </message>
     <message>
         <source>The password of the VNC server</source>
         <translation>La password per il server VNC</translation>
     </message>
     <message>
         <source>Toggle obscuring the password</source>
         <translation>Cambia l&apos;oscuramento della password</translation>
     </message>
     <message>
         <source>The name of the VNC server</source>
         <translation>Il nome del server VNC</translation>
     </message>
     <message>
         <source>The host name of the VNC server</source>
         <translation>Il nome host del server VNC</translation>
     </message>
     <message>
         <source>The display number of the VNC server</source>
         <translation>Il numero del display del server VNC</translation>
     </message>
     <message>
         <source>Allow other users to connect to the VNC server</source>
         <translation>Permetti ad altri utenti di connettersi al server VNC</translation>
     </message>
     <message>
         <source>Request that the VNC server transfer 8 bit color</source>
         <translation>Richiedi che il server VNC trasferisca a 8 bit di colori</translation>
     </message>
     <message>
         <source>Delay between requesting updates from the server</source>
         <translation>Ritardo tra richieste di aggiornamento dal server</translation>
     </message>
     <message>
         <source>Scale the remote display to fit on the PDA (Slow)</source>
         <translation>Scala lo schermo remoto per farlo entrare sul PDA (Lento)</translation>
     </message>
     <message>
         <source>Enable transmiting identical rectangles as references to existing data</source>
         <translation>Abilita la trasmissione di rettangoli uguali come riferimenti per dati esistenti</translation>
     </message>
 </context>
 </TS>
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
@@ -1,287 +1,279 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>DocTabSettings</name>
     <message>
         <source>Enable the Documents Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check, if you want the Documents Tab to be visible.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputMethodSettings</name>
     <message>
         <source>Resize application on Popup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable floating and resizing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check, if you want the application to be automatically resized if the input method pops up.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check, if you want to move and/or resize input methods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Specify the percentage of the screen width for the input method</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherSettings</name>
     <message>
         <source>Launcher Settings</source>
         <translation>Impostazioni Launcher</translation>
     </message>
     <message>
         <source>Taskbar</source>
         <translation>Taskbar</translation>
     </message>
     <message>
         <source>O-Menu</source>
         <translation>O-Menu</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Tab</translation>
     </message>
     <message>
         <source>InputMethods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MenuSettings</name>
     <message>
         <source>Load applets in O-Menu:</source>
         <translation>Carica applet nel O-Menu:</translation>
     </message>
     <message>
         <source>Show Launcher tabs in O-Menu</source>
         <translation>Mostra tab del Launcher nel O-Menu</translation>
     </message>
     <message>
         <source>Check the applets that you want to have included in the O-Menu.</source>
         <translation>Controlla le applet che vuoi inserite nel O-Menu.</translation>
     </message>
     <message>
         <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
         <translation>Aggiungi i contenuti dei Tab del Launcher come menu nel O-Menu.</translation>
     </message>
     <message>
         <source>Show Applications in Subpopups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Sample 1</source>
         <translation>Esempio 1</translation>
     </message>
     <message>
         <source>Sample 2</source>
         <translation>Esempio 2</translation>
     </message>
     <message>
         <source>Sample 3</source>
         <translation>Esempio 3</translation>
     </message>
 </context>
 <context>
     <name>TabDialog</name>
     <message>
         <source>Edit Tab</source>
         <translation>Modifica Tab</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>Sfondo</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
         <source>Icons</source>
         <translation>Icone</translation>
     </message>
     <message>
         <source>Previewing %1</source>
         <translation>Anteprima %1</translation>
     </message>
     <message>
         <source>This is a rough preview of what the currently selected Tab will look like.</source>
         <translation>Questa è un&apos;anteprima di come verrà visualizzato il Tab selezionato.</translation>
     </message>
     <message>
         <source>Use a custom font</source>
         <translation>Usa un font personalizzato</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
         <source>Ruled</source>
         <translation>Ruled</translation>
     </message>
     <message>
         <source>Solid color</source>
         <translation>Colore solido</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Immagine</translation>
     </message>
     <message>
         <source>Select...</source>
         <translation>Seleziona...</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Predefinito</translation>
     </message>
     <message>
         <source>Size:</source>
         <translation>Dimensione:</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Piccolo</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Grande</translation>
     </message>
     <message>
         <source>Color:</source>
         <translation>Colore:</translation>
     </message>
     <message>
         <source>Columns:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatic</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TabsSettings</name>
     <message>
         <source>Launcher Tabs:</source>
         <translation>Launcher Tab:</translation>
     </message>
     <message>
         <source>foobar</source>
         <translation>foobar</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuovo</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Modifica</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Elimina</translation>
     </message>
     <message>
         <source>Enable big busy indicator</source>
         <translation>Abilita indicatore occupato grande</translation>
     </message>
     <message>
-        <source>Enable blinking busy indicator</source>
-        <translation 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>
         <source>Not implemented yet</source>
         <translation>Ancora non implementato</translation>
     </message>
     <message>
         <source>Enable animated busy indicator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Activate this, if you want an animatedbusy indicator for starting applications in the Launcher.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable static background pixmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Activate this, if you want the background pixmap not to scroll with the icons.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskbarSettings</name>
     <message>
         <source>Load applets in Taskbar:</source>
         <translation>Carica applet nella Taskbar</translation>
     </message>
     <message>
         <source>Check the applets that you want displayed in the Taskbar.</source>
         <translation>Controlla le applet che vuoi visualizzate nella Taskbar.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/libbatteryapplet.ts b/i18n/it/libbatteryapplet.ts
index 11c21a9..4f4afba 100644
--- a/i18n/it/libbatteryapplet.ts
+++ b/i18n/it/libbatteryapplet.ts
@@ -1,111 +1,87 @@
 <!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>
         <source>Very Low</source>
         <translation>Molto Basso</translation>
     </message>
     <message>
         <source>Critical</source>
         <translation>Critico</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Sconosciuto</translation>
     </message>
     <message>
         <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>
         <source>Remaining Power: %1%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remaining Time: %1m %2s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remaing Power: %1 %2
 Remaining Time: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ipaq  %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,1519 +1,1437 @@
 <!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>
     </message>
     <message>
         <source>New Account</source>
         <translation>Nuovo Account</translation>
     </message>
     <message>
         <source>Edit Account: </source>
         <translation>Modifica Account: </translation>
     </message>
     <message>
         <source>Dial</source>
         <translation>Componi</translation>
     </message>
     <message>
         <source>Edit Login Script</source>
         <translation>Modifica Script Login</translation>
     </message>
     <message>
         <source>Authentication</source>
         <translation>Autenticazione</translation>
     </message>
     <message>
         <source>IP Setup</source>
         <translation>Impostazioni IP</translation>
     </message>
     <message>
         <source>IP</source>
         <translation>IP</translation>
     </message>
     <message>
         <source>Gateway Setup</source>
         <translation>Impostazioni Gateway</translation>
     </message>
     <message>
         <source>Gateway</source>
         <translation>Gateway</translation>
     </message>
     <message>
         <source>DNS Servers</source>
         <translation>Server DNS</translation>
     </message>
     <message>
         <source>DNS</source>
         <translation>DNS</translation>
     </message>
     <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>
         <source>PAP</source>
         <translation>PAP</translation>
     </message>
     <message>
         <source>Terminal-based</source>
         <translation>Basato-sul-terminale</translation>
     </message>
     <message>
         <source>CHAP</source>
         <translation>CHAP</translation>
     </message>
     <message>
         <source>PAP/CHAP</source>
         <translation>PAP/CHAP</translation>
     </message>
     <message>
         <source>&lt;p&gt;Specifies the method used to identify yourself to
 the PPP server. Most universities still use
 &lt;b&gt;Terminal&lt;/b&gt;- or &lt;b&gt;Script&lt;/b&gt;-based authentication,
 while most ISP use &lt;b&gt;PAP&lt;/b&gt; and/or &lt;b&gt;CHAP&lt;/b&gt;. If
 unsure, contact your ISP.
 
 If you can choose between PAP and CHAP,
 choose CHAP, because it&apos;s much safer. If you don&apos;t know
 whether PAP or CHAP is right, choose PAP/CHAP.</source>
         <translation>&lt;p&gt;Specifica il metodo utilizzato per identificarti sul server
 PPP. Molte università utilizzano ancora l&apos;autenticazione
 basata su &lt;b&gt;terminale&lt;/b&gt; o su &lt;b&gt;script&lt;/b&gt;,
 mentre molti ISP utilizzano &lt;b&gt;PAP&lt;/b&gt; e/o &lt;b&gt;CHAP&lt;/b&gt;.
 Se non sei sicuro, contatta il tuo ISP.
 
 Se puoi scegliere tra PAP e CHAP, scegli CHAP, poichè
 è molto più sicuro. Se non sai quale dei due è quello corretto,
 scegli PAP/CHAP.</translation>
     </message>
     <message>
         <source>Username: </source>
         <translation>Username: </translation>
     </message>
     <message>
         <source>Enter your username here...</source>
         <translation>Inserisci qui il tuo username...</translation>
     </message>
     <message>
         <source>Password: </source>
         <translation>Password: </translation>
     </message>
     <message>
         <source>Enter your password here</source>
         <translation>Inserisci qui la tua password</translation>
     </message>
     <message>
         <source>Store password</source>
         <translation>Memorizza password</translation>
     </message>
     <message>
         <source>&lt;p&gt;When this is turned on, your ISP password
 will be saved in &lt;i&gt;kppp&lt;/i&gt;&apos;s config file, so
 you do not need to type it in every time.
 
 &lt;b&gt;&lt;font color=&quot;red&quot;&gt;Warning:&lt;/font&gt; your password will be stored as
 plain text in the config file, which is
 readable only to you. Make sure nobody
 gains access to this file!</source>
         <translation>&lt;p&gt;Se questa opzione è attivata, la password per il tuo ISP
 verrà salvata nel file di configurazione di &lt;i&gt;kppp&lt;/i&gt;, così
 non dovrai ridigitarla ogni volta.
 
 &lt;b&gt;&lt;font color=&quot;red&quot;&gt;Attenzione:&lt;/font&gt; la tua password sarà
 salvata nel file di configurazione in chiaro, che è leggibile
 solo da te. Controlla che nessun altro abbia accesso a questo file!</translation>
     </message>
     <message>
         <source>error</source>
         <translation>errore</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Login script has unbalanced loop Start/End&lt;qt&gt;</source>
         <translation>&lt;qt&gt;Lo script di login ha un ciclo di Inizio/Fine non bilanciato&lt;qt&gt;</translation>
     </message>
 </context>
 <context>
     <name>ChooserWidget</name>
     <message>
         <source>&amp;Edit...</source>
         <translation>&amp;Modifica...</translation>
     </message>
     <message>
         <source>&amp;New...</source>
         <translation>&amp;Nuovo...</translation>
     </message>
     <message>
         <source>Co&amp;py</source>
         <translation>Co&amp;pia</translation>
     </message>
     <message>
         <source>De&amp;lete</source>
         <translation>Cance&amp;lla</translation>
     </message>
 </context>
 <context>
     <name>DNSWidget</name>
     <message>
         <source>Domain name:</source>
         <translation>Nome Dominio:</translation>
     </message>
     <message>
         <source>If you enter a domain name here, this domain
 name is used for your computer while you are
 connected. When the connection is closed, the
 original domain name of your computer is
 restored.
 
 If you leave this field blank, no changes are
 made to the domain name.</source>
         <translation>Se inserisci qui un nome di dominio, quest&apos;ultimo
 verrà utilizzato per la connessione.
 Quando la connessione verrà terminata, sarà ripristinato
 il nome originale del dominio del tuo computer.
 
 If you leave this field blank, no changes are
 made to the domain name.</translation>
     </message>
     <message>
         <source>Configuration:</source>
         <translation>Configurazione:</translation>
     </message>
     <message>
         <source>Automatic</source>
         <translation>Automatica</translation>
     </message>
     <message>
         <source>Manual</source>
         <translation>Manuale</translation>
     </message>
     <message>
         <source>DNS IP address:</source>
         <translation>Indirizzo IP DNS:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Allows you to specify a new DNS server to be
 used while you are connected. When the
 connection is closed, this DNS entry will be
 removed again.
 
 To add a DNS server, type in the IP address of
 the DNS server here and click on &lt;b&gt;Add&lt;/b&gt;</source>
         <translation>&lt;p&gt;Permette di specificare un nuovo server DNS per
 la connessione. Quando la connessione verrà terminata,
 questo indirizzo sarà tolto.
 
 Per inserire un server DNS, inserisci qui l&apos;indirizzo IP
 e premi su &lt;b&gt;Aggiungi&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Aggiungi</translation>
     </message>
     <message>
         <source>Click this button to add the DNS server
 specified in the field above. The entry
 will then be added to the list below</source>
         <translation>Premi questo pulsante per aggiungere il server DNS
 specificato nel campo in alto. Il server sarà
 quindi aggiunto nella lista in basso</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Rimuovi</translation>
     </message>
     <message>
         <source>Click this button to remove the selected DNS
 server entry from the list below</source>
         <translation>Premi questo pulsante per rimuovere il server DNS
 selezionato dalla lista in basso</translation>
     </message>
     <message>
         <source>DNS address list:</source>
         <translation>Lista indirizzi DNS:</translation>
     </message>
     <message>
         <source>&lt;p&gt;This shows all defined DNS servers to use
 while you are connected. Use the &lt;b&gt;Add&lt;/b&gt; and
 &lt;b&gt;Remove&lt;/b&gt; buttons to modify the list</source>
         <translation>&lt;p&gt;Qui vengono visualizzati tutti i server DNS da utilizzare
 durante la connessione. Utilizza i pulsanti &lt;b&gt;Aggiungi&lt;/b&gt; e
 &lt;b&gt;Rimuovi&lt;/b&gt; per modificare la lista</translation>
     </message>
     <message>
         <source>Disable DNS servers during connection</source>
         <translation>Disabilita server DNS durante la connessione</translation>
     </message>
     <message>
         <source>&lt;p&gt;When this option is selected, all DNS
 servers specified in &lt;tt&gt;/etc/resolv.conf&lt;/tt&gt; are
 temporary disabled while the dialup connection
 is established. After the connection is
 closed, the servers will be re-enabled
 
 Typically, there is no reason to use this
 option, but it may become useful under 
 some circumstances.</source>
         <translation>&lt;p&gt;Quando questa opzione è selezionata, tutti i server
 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>
     </message>
     <message>
         <source>New Device</source>
         <translation>Nuovo Dispositivo</translation>
     </message>
     <message>
         <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>
         <translation>Crea una copia del dispositivo selezionato.
 Tutte le impostazioni del dispositivo selezionato
 saranno copiate su un nuovo dispositivo, che
 potrai modificare a piacimento</translation>
     </message>
     <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;Cancella il dispositivo selezionato
 
 &lt;font color=&quot;red&quot;&gt;&lt;b&gt;Usare con cautela!&lt;/b&gt;&lt;/font&gt;</translation>
     </message>
     <message>
         <source>You must enter a unique device name</source>
         <translation>Devi inserire un nome univoco per il dispositivo</translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished">Errore</translation>
     </message>
 </context>
 <context>
     <name>DialWidget</name>
     <message>
         <source>Connection name:</source>
         <translation>Nome Connessione:</translation>
     </message>
     <message>
         <source>Type in a unique name for this connection</source>
         <translation>Digita un nome univoco per questa connessione</translation>
     </message>
     <message>
         <source>Phone number:</source>
         <translation>Numero telefonico:</translation>
     </message>
     <message>
         <source>&amp;Add...</source>
         <translation>&amp;Aggiungi...</translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation>&amp;Rimuovi</translation>
     </message>
     <message>
         <source>&lt;p&gt;Specifies the phone numbers to dial. You
 can supply multiple numbers here, simply
 click on &quot;Add&quot;. You can arrange the
 order the numbers are tried by using the
 arrow buttons.
 
 When a number is busy or fails, &lt;i&gt;kppp&lt;/i&gt; will 
 try the next number and so on</source>
         <translation>&lt;p&gt;Specifica i numeri telefonici da utilizzare. Puoi
 impostare più numeri, premi semplicemente su
 &quot;Aggiungi&quot;. Puoi modificarel&apos;ordine di composizione
 dei numeri utilizzando le frecce.
 
 Quando un numero è occupato o fallisce, &lt;i&gt;kppp&lt;/i&gt;
 chiamerà il numero successivo e così via</translation>
     </message>
     <message>
         <source>Customize pppd Arguments...</source>
         <translation>Modifica Opzioni pppd...</translation>
     </message>
 </context>
 <context>
     <name>ExecWidget</name>
     <message>
         <source>Here you can select commands to run at certain stages of the connection. The commands are run with your real user id, so you cannot run any commands here requiring root permissions (unless, of course, you are root).&lt;br&gt;&lt;br&gt;Be sure to supply the whole path to the program otherwise we might be unable to find it.</source>
         <translation>Qui puoi selezionare i comandi da eseguire durante certe fasi della connessione. I comandi verranno eseguiti con la tua user id, quindi non puoi eseguire comandi che richiedono privilegi di root (a meno che, naturalmente, tu non sia già root).&lt;br&gt;&lt;br&gt;Digita per i programmi tutto il path completo altrimenti potrebbero non essere trovati.</translation>
     </message>
     <message>
         <source>Before connect:</source>
         <translation>Prima della connessione:</translation>
     </message>
     <message>
         <source>Allows you to run a program &lt;b&gt;before&lt;/b&gt; a connection
 is established. It is called immediately before
 dialing has begun.
 
 This might be useful, e.g. to stop HylaFAX blocking the
 modem.</source>
         <translation>Permette di eseguire un programma &lt;b&gt;prima&lt;/b&gt; che una connessione
 sia stabilita. Viene eseguito immediatamente prima della composizione.
 
 Può essere utile, ad esempio per bloccare HylaFAX dall&apos;occupare
 il modem.</translation>
     </message>
     <message>
         <source>Upon connect:</source>
         <translation>Dopo la connessione:</translation>
     </message>
     <message>
         <source>Allows you to run a program &lt;b&gt;after&lt;/b&gt; a connection
 is established. When your program is called, all
 preparations for an Internet connection are finished.
 
 Very useful for fetching mail and news</source>
         <translation>Permette di eseguire un programma &lt;b&gt;dopo&lt;/b&gt; che una
 connessione sia stabilita. Quando viene eseguito, tutti i
 preparativi per la connessione Internet sono terminati.
 
 Molto utile per scaricare la posta e le news</translation>
     </message>
     <message>
         <source>Before disconnect:</source>
         <translation>Prima della disconnessione:</translation>
     </message>
     <message>
         <source>Allows you to run a program &lt;b&gt;before&lt;/b&gt; a connection
 is closed. The connection will stay open until
 the program exits.</source>
         <translation>Permette di eseguire un programma &lt;b&gt;prima&lt;/b&gt; che una
 connessione sia terminata. La connessione rimarrà aperta finchè
 il programma non terminerà.</translation>
     </message>
     <message>
         <source>Upon disconnect:</source>
         <translation>Dopo la disconnessione:</translation>
     </message>
     <message>
         <source>Allows you to run a program &lt;b&gt;after&lt;/b&gt; a connection
 has been closed.</source>
         <translation>Permette di eseguire un programma &lt;b&gt;dopo&lt;/b&gt; che una
 connessione sia terminata.</translation>
     </message>
 </context>
 <context>
     <name>GatewayWidget</name>
     <message>
         <source>Configuration</source>
         <translation>Configurazione</translation>
     </message>
     <message>
         <source>Default gateway</source>
         <translation>Gateway predefinito</translation>
     </message>
     <message>
         <source>This makes the PPP peer computer (the computer
 you are connected to with your modem) to act as
 a gateway. Your computer will send all packets not
 going to a computer inside your local net to this
 computer, which will route these packets.
 
 This is the default for most ISPs, so you should
 probably leave this option on.</source>
         <translation>Questa opzione utilizza il computer a cui sei connesso
 (tramite il modem) come un gateway.
 Il tuo computer invierà a questo computer tutti i pacchetti
 non destinati a nessun altro computer nella tua rete locale,
 che li instraderà.
 
 Questa è l&apos;opzione predefinita per molti ISP, quindi
 probabilmente dovrai lasciarla attiva.</translation>
     </message>
     <message>
         <source>Static gateway</source>
         <translation>Gateway statico</translation>
     </message>
     <message>
         <source>&lt;p&gt;Allows you to specify which computer you want
 to use as gateway (see &lt;i&gt;Default Gateway&lt;/i&gt; above)</source>
         <translation>&lt;p&gt;Permette di specificare quale computer vuoi utilizzare
 come gateway (vedi &lt;i&gt;Gateway Predefinito&lt;/i&gt; qui sopra)</translation>
     </message>
     <message>
         <source>Gateway IP address:</source>
         <translation>Indirizzo IP Gateway:</translation>
     </message>
     <message>
         <source>Assign the default route to this gateway</source>
         <translation>Assegna la rotta predefinita a questo gateway</translation>
     </message>
     <message>
         <source>If this option is enabled, all packets not
 going to the local net are routed through
 the PPP connection.
 
 Normally, you should turn this on</source>
         <translation>Se questa opzione è abilitata, tutti i pacchetti
 per la rete locale saranno instradati attraverso
 la connessione PPP.
 
 Normalmente questa opzione è abilitata</translation>
     </message>
 </context>
 <context>
     <name>IPWidget</name>
     <message>
         <source>Configuration</source>
         <translation>Configurazione</translation>
     </message>
     <message>
         <source>Dynamic IP address</source>
         <translation>Indirizzo IP Dinamico</translation>
     </message>
     <message>
         <source>Select this option when your computer gets an
 internet address (IP) every time a
 connection is made.
 
 Almost every Internet Service Provider uses
 this method, so this should be turned on.</source>
         <translation>Seleziona questa opzione se il computer ottiene
 un indirizzo internet (IP) ogni volta che viene
 effettuata una connessione.
 
 Questo metodo viene utilizzato da quasi tutti i
 Service Provider Internet, quindi può essere
 attivato.</translation>
     </message>
     <message>
         <source>Static IP address</source>
         <translation>Indirizzo IP Statico</translation>
     </message>
     <message>
         <source>Select this option when your computer has a
 fixed internet address (IP). Most computers
 don&apos;t have this, so you should probably select
 dynamic IP addressing unless you know what you
 are doing.</source>
         <translation>Seleziona questa opzione se il computer utilizza un
 indirizzo internet (IP) fisso. Normalmente non viene
 utilizzato, quindi a meno che tu non sappia bene
 cosa stai facendo, seleziona l&apos;indirizzo IP dinamico.
 </translation>
     </message>
     <message>
         <source>IP address:</source>
         <translation>Indirizzo IP:</translation>
     </message>
     <message>
         <source>If your computer has a permanent internet
 address, you must supply your IP address here.</source>
         <translation>Se il computer ha un indirizzo internet permanente,
 devi inserire qui l&apos;indirizzo IP.</translation>
     </message>
     <message>
         <source>Subnet mask:</source>
         <translation>Machera Subnet:</translation>
     </message>
     <message>
         <source>&lt;p&gt;If your computer has a static Internet address,
 you must supply a network mask here. In almost
 all cases this netmask will be &lt;b&gt;255.255.255.0&lt;/b&gt;,
 but your mileage may vary.
 
 If unsure, contact your Internet Service Provider</source>
         <translation>&lt;p&gt;Se il computer ha un indirizzo internet statico,
 devi inserire qui una maschera di rete. In quasi tutti i
 casi la netmask sarà &lt;b&gt;255.255.255.0&lt;/b&gt;,
 ma potrebbe anche essere diversa.
 
 Se non sei sicuro, contatta il tuo Internet Service Provider</translation>
     </message>
     <message>
         <source>Auto-configure hostname from this IP</source>
         <translation>Configura automaticamente hostname da questo IP</translation>
     </message>
     <message>
         <source>&lt;p&gt;Whenever you connect, this reconfigures
 your hostname to match the IP address you
 got from the PPP server. This may be useful
 if you need to use a protocol which depends
 on this information, but it can also cause several
 &lt;a href=&quot;kppp-7.html#autohostname&quot;&gt;problems&lt;/a&gt;.
 
 Don&apos;t enable this unless you really need it.</source>
         <translation>&lt;p&gt;Ogni volta che ti connetti, il tuo hostname viene
 modificato per essere compatibile con l&apos;indirizzo IP
 che ti viene assegnato dal server PPP. Questo può
 essere utile se utilizzi un protocollo che dipende da
 questa informazione, ma può anche causare qualche
 &lt;a href=&quot;kppp-7.html#autohostname&quot;&gt;problema&lt;/a&gt;.
 
 Non abilitare quest&apos;opzione se non sai cosa stai facendo.</translation>
     </message>
     <message>
         <source>Selecting this option might cause some weird problems with the X-server and applications while kppp is connected. Don&apos;t use it until you know what you are doing!
 For more information take a look at the handbook (or help) in the section &quot;Frequently asked questions&quot;.</source>
         <translation>Selezionando quest&apos;opzione si potrebbero avere degli strani problemi con il server X e le applicazioni quando kppp è connesso Non usarla se non sai bene cosa stai facendo!
 Per informazioni più dettagliate guarda nella documentazione nella sezione &quot;Domande più frequenti&quot; (FAQ).</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Attenzione</translation>
     </message>
 </context>
 <context>
     <name>InterfacePPP</name>
     <message>
         <source>No password</source>
         <translation>Nessuna password</translation>
     </message>
     <message>
         <source>Username defined but no password
  Please enter a password</source>
         <translation>Username definito ma nessuna password
  Inserire una password</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
 </context>
 <context>
     <name>ModemTransfer</name>
     <message>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
 </context>
 <context>
     <name>ModemWidget</name>
     <message>
         <source>Modem &amp;name:</source>
         <translation>&amp;Nome Modem:</translation>
     </message>
     <message>
         <source>Modem de&amp;vice:</source>
         <translation>Dispositi&amp;vo Modem:</translation>
     </message>
     <message>
         <source>This specifies the serial port your modem is attached 
 to. On Linux/x86, typically this is either /dev/ttyS0 
 (COM1 under DOS) or /dev/ttyS1 (COM2 under DOS).
 
 If you have an internal ISDN card with AT command
 emulation (most cards under Linux support this), you
 should select one of the /dev/ttyIx devices.</source>
         <translation>Questo specifica la porta seriale dove è attaccato il modem.
 Su Linux/x86, normalmente può essere /dev/ttyS0 
 (COM1 sotto DOS) o /dev/ttyS1 (COM2 sotto DOS).
 
 Se utilizzi una scheda interna ISDN con emulazione dei
 comandi AT (molte schede sotto Linux lo supportano),
 devi selezione una delle /dev/ttyIx.</translation>
     </message>
     <message>
         <source>&amp;Flow control:</source>
         <translation>Controllo di &amp;Flusso:</translation>
     </message>
     <message>
         <source>Hardware [CRTSCTS]</source>
         <translation>Hardware [CRTSCTS]</translation>
     </message>
     <message>
         <source>Software [XON/XOFF]</source>
         <translation>Software [XON/XOFF]</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nessuno</translation>
     </message>
     <message>
         <source>&lt;p&gt;Specifies how the serial port and modem
 communicate. You should not change this unless
 you know what you are doing.
 
 &lt;b&gt;Default&lt;/b&gt;: CRTSCTS</source>
         <translation>&lt;p&gt;Specifica come la porta seriale ed il modem
 comunicano. Non modificare questa impostazione
 se non sai veramente cosa stai facendo.
 
 &lt;b&gt;Predefinito&lt;/b&gt;: CRTSCTS</translation>
     </message>
     <message>
         <source>&amp;Line termination:</source>
         <translation>Terminazione &amp;Linea:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Specifies how AT commands are sent to your
 modem. Most modems will work fine with the
 default &lt;i&gt;CR/LF&lt;/i&gt;. If your modem does not react
 to the init string, you should try different
 settings here
 
 &lt;b&gt;Default&lt;/b&gt;: CR/LF</source>
         <translation>&lt;p&gt;Specifica come i comandi AT sono inviati al
 modem. Molti modem lavorano correttamente con
 l&apos;impostazione predefinita &lt;i&gt;CR/LF&lt;/i&gt;. Se il
 modem non reagisce alla stringa di inizializzazione,
 prova con diverse impostazioni di questo parametro.
 
 &lt;b&gt;Predefinito&lt;/b&gt;: CR/LF</translation>
     </message>
     <message>
         <source>Co&amp;nnection speed:</source>
         <translation>Velocità di Co&amp;nnessione:</translation>
     </message>
     <message>
         <source>Specifies the speed your modem and the serial
 port talk to each other. You should begin with
 the default of 38400 bits/sec. If everything
 works you can try to increase this value, but to
 no more than 115200 bits/sec (unless you know
 that your serial port supports higher speeds).</source>
         <translation>Specifica la velocità con cui la porta seriale ed il
 modem comunicano. Puoi iniziare con la velocità
 predefinita di 38400 bits/sec. Se è tutto ok puoi
 in seguito aumentarla, ma non più di 115200 bits/sec
 (a meno che la tua porta seriale non supporti velocità
 più elevate).</translation>
     </message>
     <message>
         <source>&amp;Use lock file</source>
         <translation>&amp;Usa file di lock</translation>
     </message>
     <message>
         <source>&lt;p&gt;To prevent other programs from accessing the
 modem while a connection is established, a
 file can be created to indicate that the modem
 is in use. On Linux an example file would be
 &lt;tt&gt;/var/lock/LCK..ttyS1&lt;/tt&gt;
 Here you can select whether this locking will
 be done.
 
 &lt;b&gt;Default&lt;/b&gt;: On</source>
         <translation>&lt;p&gt;Per prevenire che altri programmi accedano
 al modem mentre è stabilita la connessione, un file
 può essere creato per indicare che il modem
 è in uso. Un esempio di questo file su Linux è
 &lt;tt&gt;/var/lock/LCK..ttyS1&lt;/tt&gt;
 Qui puoi selezionare se effettuare o no questa
 operazione.
 
 &lt;b&gt;Predefinito&lt;/b&gt;: Attivo</translation>
     </message>
     <message>
         <source>Modem timeout:</source>
         <translation>Timeout Modem:</translation>
     </message>
     <message>
         <source> sec</source>
         <translation> sec</translation>
     </message>
     <message>
         <source>This specifies how long &lt;i&gt;kppp&lt;/i&gt; waits for a
 &lt;i&gt;CONNECT&lt;/i&gt; response from your modem. The
 recommended value is 30 seconds.</source>
         <translation>Questo specifica quanto a lungo &lt;i&gt;kppp&lt;/i&gt; deve attendere
 per la stringa di risposta &lt;i&gt;CONNECT&lt;/i&gt; dal modem. Il valore
 raccomandato è di 30 secondi.</translation>
     </message>
 </context>
 <context>
     <name>ModemWidget2</name>
     <message>
         <source>Busy wait:</source>
         <translation>Attesa occupato:</translation>
     </message>
     <message>
         <source>&amp;Wait for dial tone before dialing</source>
         <translation>&amp;Attesa del tono di libero prima di comporre</translation>
     </message>
     <message>
         <source>&lt;p&gt;Normally the modem waits for a dial tone
 from your phone line, indicating that it can
 start to dial a number. If your modem does not
 recognize this sound, or your local phone system
 does not emit such a tone, uncheck this option
 
 &lt;b&gt;Default:&lt;/b&gt;: On</source>
         <translation>&lt;p&gt;Normalmente il modem attende un tono di libero
 dalla linea telefonica, che indica che può
 iniziare a comporre il numero. Se il tuo modem non
 riconosce il suono, o il tuo sistema telefonico non
 lo prevede, togli il check da questa opzione
 
 &lt;b&gt;Predefinito:&lt;/b&gt;: Attivo</translation>
     </message>
     <message>
         <source> sec</source>
         <translation> sec</translation>
     </message>
     <message>
         <source>Specifies the number of seconds to wait before
 redial if all dialed numbers are busy. This is
 necessary because some modems get stuck if the
 same number is busy too often.
 
 The default is 0 seconds, you should not change
 this unless you need to.</source>
         <translation>Specifica il numero di secondi da attendere prima di
 ricomporre se tutti i numeri chiamati sono occupati.
 Ciò è necessario poichè alcuni modem si bloccano
 se lo stesso numero è occupato troppe volte.
 
 Normalmente è 0 secondi, non cambiarlo
 se non ne hai realmente bisogno.</translation>
     </message>
     <message>
         <source>Modem &amp;volume:</source>
         <translation>&amp;Volume modem:</translation>
     </message>
     <message>
         <source>Most modems have a speaker which makes
 a lot of noise when dialing. Here you can
 either turn this completely off or select a
 lower volume.
 
 If this does not work for your modem,
 you must modify the modem volume command.</source>
         <translation>Molti modem hanno un altoparlante che crea
 molto rumore durante la composizione. Qui
 puoi spegnerlo completamente o impostare
 un volume più basso.
 
 Se non funziona con il tuo modem, devi
 modificare direttamente il comando.</translation>
     </message>
     <message>
         <source>Modem asserts CD line</source>
         <translation>Modem esige linea CD</translation>
     </message>
     <message>
         <source>This controls how &lt;i&gt;kppp&lt;/i&gt; detects that the modem
 is not responding. Unless you are having
 problems with this, do not modify this setting.
 
 &lt;b&gt;Default&lt;/b&gt;: Off</source>
         <translation>Questo controlla come &lt;i&gt;kppp&lt;/i&gt; rileva che il modem
 inon sta rispondendo. Se non hai avuto problemi
 con questa opzione, non modificarla.
 
 &lt;b&gt;Predefinito&lt;/b&gt;: Non attivo</translation>
     </message>
     <message>
         <source>Mod&amp;em Commands...</source>
         <translation>Comandi Mod&amp;em...</translation>
     </message>
     <message>
         <source>Allows you to change the AT command for
 your modem.</source>
         <translation>Permette di cambiare i comandi AT per
 il tuo modem.</translation>
     </message>
     <message>
         <source>&amp;Query Modem...</source>
         <translation>&amp;Interroga Modem...</translation>
     </message>
     <message>
         <source>Most modems support the ATI command set to
 find out vendor and revision of your modem.
 
 Press this button to query your modem for
 this information. It can be useful to help
 you setup the modem</source>
         <translation>Molti modem supportano il comando ATI per
 trovare la marca e la versione del modem.
 
 Premi questo pulsante per interrogare il tuo
 modem per quest&apos;informazione. Può infatti
 essere utile per configurare il modem</translation>
     </message>
 </context>
 <context>
     <name>PPPConfigWidget</name>
     <message>
         <source>Configure Modem</source>
         <translation>Configura Modem</translation>
     </message>
     <message>
         <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>
         <translation>Opzione:</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Aggiungi</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Rimuovi</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Predefiniti</translation>
     </message>
 </context>
 <context>
     <name>PhoneNumberDialog</name>
     <message>
         <source>Add Phone Number</source>
         <translation>Aggiungi Numero Telefonico</translation>
     </message>
     <message>
         <source>Enter a phone number:</source>
         <translation>Inserisci un numero telefonico:</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>PPP</source>
         <translation>PPP</translation>
     </message>
     <message>
         <source>generic ppp device</source>
         <translation>generico dispositivo ppp</translation>
     </message>
     <message>
         <source>Unable to open modem.</source>
         <translation>Impossibile interfacciarsi con il modem.</translation>
     </message>
     <message>
         <source>Unable to detect state of CD line.</source>
         <translation>Impossibile identificare stato della linea CD.</translation>
     </message>
     <message>
         <source>The modem is not ready.</source>
         <translation>Il modem non risponde.</translation>
     </message>
     <message>
         <source>The modem is busy.</source>
         <translation>Il modem è occupato.</translation>
     </message>
     <message>
         <source>Modem Ready.</source>
         <translation>Modem Pronto.</translation>
     </message>
     <message>
         <source>Can&apos;t restore tty settings: tcsetattr()
 </source>
         <translation>Impossibile ripristinare le impostazioni della tty: tcsetattr()
 </translation>
     </message>
     <message>
         <source>The modem does not respond.</source>
         <translation>Il modem non risponde.</translation>
     </message>
     <message>
         <source>Unknown speed</source>
         <translation>Velocità sconosciuta</translation>
     </message>
     <message>
         <source>ATI Query</source>
         <translation>Richiesta ATI</translation>
     </message>
     <message>
         <source>Unable to create modem lock file.</source>
         <translation>Impossibile creare file di lock per il modem.</translation>
     </message>
     <message>
         <source>Looking for modem...</source>
         <translation>Ricerca modem...</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Cancella</translation>
     </message>
     <message>
         <source>Modem Query timed out.</source>
         <translation>Richiesta Modem scaduta.</translation>
     </message>
     <message>
         <source>Modem device is locked.</source>
         <translation>Device Modem bloccato.</translation>
     </message>
     <message>
         <source>Modem Ready</source>
         <translation>Modem Pronto</translation>
     </message>
     <message>
         <source>One moment please...</source>
         <translation>Attendere un attimo...</translation>
     </message>
     <message>
         <source>Modem Query Results</source>
         <translation>Risultati Richiesta Modem</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Chiudi</translation>
     </message>
     <message>
         <source>You&apos;re not allowed to dial out with kppp.
 Contact your system administrator.</source>
         <translation>Non ti è permesso di chiamare con kppp.
 Contatta l&apos;amministratore di sistema.</translation>
     </message>
     <message>
         <source>Cannot find the PPP daemon!
 Make sure that pppd is installed.</source>
         <translation>Impossibile trovare il demone PPP!
 Assicurati che pppd sia installato.</translation>
     </message>
     <message>
         <source>You do not have the permission to start pppd!
 Contact your system administrator and ask to get access to pppd.</source>
         <translation>Non hai i permessi per avviare pppd!
 Contatta l&apos;amministratore di sistema e chiedi l&apos;accesso a pppd.</translation>
     </message>
     <message>
         <source>You don&apos;t have sufficient permission to run
 %1
 Please make sure that kppp is owned by root and has the SUID bit set.</source>
         <translation>Non hai permessi sufficienti per eseguire
 %1
 Assicurati che kppp sia di proprietà di root e che abbia il bit SUID impostato.</translation>
     </message>
     <message>
         <source>%1 is missing or can&apos;t be read!
 Ask your system administrator to create this file (can be empty) with appropriate read and write permissions.</source>
         <translation>Impossibile trovare o leggere %1!
 Chiedi all&apos;amministratore di sistema di creare il file (può essere vuoto) con i corretti permessi di lettura e scrittura.</translation>
     </message>
     <message>
         <source>Edit Modem Commands</source>
         <translation>Modifica Comandi Modem</translation>
     </message>
     <message>
         <source>Pre-init delay (sec/100):</source>
         <translation>Ritardo Pre-inizializzazione (sec/100):</translation>
     </message>
     <message>
         <source>Initialization string %1:</source>
         <translation>Stringa di inizializzazione %1:</translation>
     </message>
     <message>
         <source>Post-init delay (sec/100):</source>
         <translation>Ritardo Post-inizializzazione (sec/100):</translation>
     </message>
     <message>
         <source>Dialing speed (sec/100):</source>
         <translation>Velocità composizione (sec/100):</translation>
     </message>
     <message>
         <source>Init response:</source>
         <translation>Risposta inizializzazione:</translation>
     </message>
     <message>
         <source>No dial tone detection:</source>
         <translation>Ricerca tono di libero:</translation>
     </message>
     <message>
         <source>Dial string:</source>
         <translation>Stringa di composizione:</translation>
     </message>
     <message>
         <source>Connect response:</source>
         <translation>Risposta connessione:</translation>
     </message>
     <message>
         <source>Busy response:</source>
         <translation>Risposta occupato:</translation>
     </message>
     <message>
         <source>No carrier response:</source>
         <translation>Risposta nessun segnale:</translation>
     </message>
     <message>
         <source>No dial tone response:</source>
         <translation>Risposta nessun segnale di libero:</translation>
     </message>
     <message>
         <source>Hangup string:</source>
         <translation>Stringa hangup:</translation>
     </message>
     <message>
         <source>Hangup response:</source>
         <translation>Risposta hangup:</translation>
     </message>
     <message>
         <source>Answer string:</source>
         <translation>Stringa risposta:</translation>
     </message>
     <message>
         <source>Ring response:</source>
         <translation>Risposta squillo:</translation>
     </message>
     <message>
         <source>Answer response:</source>
         <translation>Risposta Ricezione:</translation>
     </message>
     <message>
         <source>Escape string:</source>
         <translation>Stringa escape:</translation>
     </message>
     <message>
         <source>Escape response:</source>
         <translation>Risposta escape:</translation>
     </message>
     <message>
         <source>Guard time (sec/50):</source>
         <translation>Tempo di sicurezza (sec/50):</translation>
     </message>
     <message>
         <source>Volume off/low/high:</source>
         <translation>Volume spento/basso/alto:</translation>
     </message>
     <message>
         <source>Connected at:</source>
         <translation>Connesso a:</translation>
     </message>
     <message>
         <source>Time connected:</source>
         <translation>Tempo connesso:</translation>
     </message>
     <message>
         <source>Volume:</source>
         <translation>Volume:</translation>
     </message>
     <message>
         <source>Session Bill:</source>
         <translation>Conto Sessione:</translation>
     </message>
     <message>
         <source>Total Bill:</source>
         <translation>Conto Totale:</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>Disconnetti</translation>
     </message>
     <message>
         <source>Byte</source>
         <translation>Byte</translation>
     </message>
     <message>
         <source>KB</source>
         <translation>KB</translation>
     </message>
     <message>
         <source>MB</source>
         <translation>MB</translation>
     </message>
     <message>
         <source>GB</source>
         <translation>GB</translation>
     </message>
     <message>
         <source>Connecting to: </source>
         <translation>In connessione con: </translation>
     </message>
     <message>
         <source>Online</source>
         <translation>Online</translation>
     </message>
     <message>
         <source>Offline</source>
         <translation>Offline</translation>
     </message>
     <message>
         <source>Log</source>
         <translation>Log</translation>
     </message>
     <message>
         <source>Connecting to: %1</source>
         <translation>Connessione a: %1</translation>
     </message>
     <message>
         <source>Running pre-startup command...</source>
         <translation>Esecuzione comando pre-avvio...</translation>
     </message>
     <message>
         <source>Initializing modem...</source>
         <translation>Inizializzazione modem...</translation>
     </message>
     <message>
         <source>Setting </source>
         <translation>Impostazioni </translation>
     </message>
     <message>
         <source>Setting speaker volume...</source>
         <translation>Impostazione volume speaker...</translation>
     </message>
     <message>
         <source>Turning off dial tone waiting...</source>
         <translation>Attesa disabilitazione tono di libero...</translation>
     </message>
     <message>
         <source>Dialing %1</source>
         <translation>In composizione %1</translation>
     </message>
     <message>
         <source>Line busy. Hanging up...</source>
         <translation>Linea occupata. Disconnessione...</translation>
     </message>
     <message>
         <source>Line busy. Waiting: %1 seconds</source>
         <translation>Linea occupata. Attesa: %1 secondi</translation>
     </message>
     <message>
         <source>No Dialtone</source>
         <translation>Nessun Tono di Libero</translation>
     </message>
     <message>
         <source>No Carrier</source>
         <translation>Nessuna Portante</translation>
     </message>
     <message>
         <source>Scanning %1</source>
         <translation>In scansione %1</translation>
     </message>
     <message>
         <source>Saving %1</source>
         <translation>In salvataggio %1</translation>
     </message>
     <message>
         <source>Sending %1</source>
         <translation>In invio %1</translation>
     </message>
     <message>
         <source>Expecting %1</source>
         <translation>In attesa %1</translation>
     </message>
     <message>
         <source>Pause %1 seconds</source>
         <translation>Pausa %1 secondi</translation>
     </message>
     <message>
         <source>Timeout %1 seconds</source>
         <translation>Tempo massimo %1 secondi</translation>
     </message>
     <message>
         <source>Hangup</source>
         <translation>Hangup</translation>
     </message>
     <message>
         <source>Answer</source>
         <translation>Risposta</translation>
     </message>
     <message>
         <source>ID %1</source>
         <translation>ID %1</translation>
     </message>
     <message>
         <source>Password %1</source>
         <translation>Password %1</translation>
     </message>
     <message>
         <source>Prompting %1</source>
         <translation>Richiesta %1</translation>
     </message>
     <message>
         <source>PW Prompt %1</source>
         <translation>Richiesta PW %1</translation>
     </message>
     <message>
         <source>Loop Start %1</source>
         <translation>Inizio Ciclo %1</translation>
     </message>
     <message>
         <source>ERROR: Nested too deep, ignored.</source>
         <translation>ERRORE: ciclo troppo annidato, ignorato.</translation>
     </message>
     <message>
         <source>Loops nested too deeply!</source>
         <translation>Ciclo troppo anidato!</translation>
     </message>
     <message>
         <source>Loop End %1</source>
         <translation>Fine Ciclo %1</translation>
     </message>
     <message>
         <source>LoopEnd without matching Start! Line: %1</source>
         <translation>Ciclo terminato senza trovare lo Start!: %1</translation>
     </message>
     <message>
         <source>Starting pppd...</source>
         <translation>Pppd in esecuzione...</translation>
     </message>
     <message>
         <source>Scan Var: %1</source>
         <translation>Var Scan: %1</translation>
     </message>
     <message>
         <source>Found: %1</source>
         <translation>Trovato: %1</translation>
     </message>
     <message>
         <source>Looping: %1</source>
         <translation>in ciclo: %1</translation>
     </message>
     <message>
         <source>Script timed out!</source>
         <translation>Tempo scaduto per lo script!</translation>
     </message>
     <message>
         <source>Scanning: %1</source>
         <translation>In ricerca: %1</translation>
     </message>
     <message>
         <source>Expecting: %1</source>
         <translation>Atteso: %1</translation>
     </message>
     <message>
         <source>Logging on to network...</source>
         <translation>Registrazione sul network...</translation>
     </message>
     <message>
         <source>Running startup command...</source>
         <translation>In esecuzione comando di avvio...</translation>
     </message>
     <message>
         <source>Done</source>
         <translation>Fatto</translation>
     </message>
     <message>
         <source>pppd command + command-line arguments exceed 2024 characters in length.</source>
         <translation>il comando pppd + le opzioni sulla riga di comando hanno superato i 2024 caratteri di lunghezza.</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Cannot find the PPP daemon!&lt;br&gt;Make sure that pppd is installed and that you have entered the correct path.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Impossibile trovare il demone PPP!&lt;br&gt;Assicurati che pppd sia installato e che hai inserito il path corretto.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Cannot execute:&lt;br&gt; %1&lt;br&gt;Please make sure that you have given setuid permission and that pppd is executable.&lt;br&gt;</source>
         <translation>&lt;qt&gt;Impossibile eseguire:&lt;br&gt; %1&lt;br&gt;Controlla che siano stati assegnati i permessi suid e che pppd sia eseguibile.&lt;br&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Cannot find:&lt;br&gt; %1&lt;br&gt;Please make sure you have setup your modem device properly and/or adjust the location of the modem device on the modem tab of the setup dialog.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Impossibile trovare:&lt;br&gt; %1&lt;br&gt;Controlla di aver impostato il modem correttamente e/o modifica l&apos;impostazione del modem nel tab modem della finestra di impostazioni.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;You have selected the authentication method PAP or CHAP. This requires that you supply a username and a password!&lt;/qt&gt;</source>
         <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>
     </message>
 </context>
 </TS>
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,1171 +1,728 @@
 <!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>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished">Settimana</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished">Mese</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished">Anno</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished">Ogni:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished">Frequenza</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished">Fine Il:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">Indefinitivamente</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">Lun</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">Mar</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">Mer</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">Gio</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">Ven</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">Sab</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">Dom</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">Ogni</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished">Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished">WeekVar</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">Indefinitivamente</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished">giorni</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished">giorno</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished">settimane</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished">settimana</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished">mesi</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished">mese</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished">anni</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished">anno</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished">e</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished">,
 e </translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished">, e </translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished">su</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished">Mai</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished">giorno(i)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">Lun</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">Mar</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">Mer</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">Gio</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">Ven</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">Sab</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">Dom</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished">settimana(e)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished">Ripeti Per</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">Giorno</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Data</translation>
     </message>
     <message>
         <source>month(s)</source>
         <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>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to edit the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to duplicate the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to delete the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to transmit the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</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">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>
         <source>Home Web Page: </source>
         <translation>Pagina Web Casa: </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Pagina Web Ufficio: </translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Ufficio: </translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Telefono Ufficio: </translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Fax Ufficio: </translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Cellulare Ufficio: </translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Cercapersone Ufficio: </translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Professione: </translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Assistente: </translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Direttore: </translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Maschile</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Femminile</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Sesso: </translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Coniuge: </translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Compleanno: </translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Anniversario: </translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Alias: </translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation>Email Principale: </translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation>Tutte le Email: </translation>
     </message>
     <message>
         <source>Children: </source>
         <translation>Figli: </translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Note:</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation>Inizio:</translation>
     </message>
     <message>
         <source>End:</source>
         <translation>Fine:</translation>
     </message>
     <message>
         <source>Note:</source>
         <translation>Nota:</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Ogni</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 ogni </translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>Il %1 ogni </translation>
     </message>
     <message>
-        <source>The %1 %1 of every</source>
-        <translation 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>
         <source>Wednesday</source>
         <translation>Mercoledì</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Giovedì</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Venerdì</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sabato</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Domenica</translation>
     </message>
     <message>
-        <source>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>
         <source>Low</source>
         <translation>Bassa</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation>Molto bassa</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Ubicazione:</translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation>Evento per tutto il giorno</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation>Evento per molti giorni</translation>
     </message>
     <message>
-        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
-        <translation 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>
         <source>User Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profession</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Has a due-date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No due-date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No reccurrence</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No start-date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No completed-date</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>°</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>°</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>°</translation>
     </message>
     <message>
         <source>th</source>
         <translation>°</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/libopieui2.ts b/i18n/it/libopieui2.ts
index df08e5c..7655487 100644
--- a/i18n/it/libopieui2.ts
+++ b/i18n/it/libopieui2.ts
@@ -1,846 +1,176 @@
 <!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>
     </message>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished">Nome</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished">Dimensione</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Data</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished">Tipo Mime</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished">FileDialog</translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished">Apri</translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished">Salva</translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished">Nome:</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation type="unfinished">Stile</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished">Dimensione</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished">Cantami o Diva del pelide Achille l&apos;ira funesta</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="unfinished">Nome</translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished"></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="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
@@ -1,1037 +1,995 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation>Tutte</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Vuota</translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation> (multi.)</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Lavoro</translation>
     </message>
     <message>
         <source>Personal</source>
         <translation>Personale</translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation> (Multi.)</translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation>Tutte</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>Nuoca Categoria</translation>
     </message>
     <message>
         <source>New Category </source>
         <translation>Nuoca Categoria</translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation>Modifica Categoria</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>Categorie</translation>
     </message>
     <message>
         <source>Application</source>
         <translation>Applicazione</translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation>Categorie Vanno Qui</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Aggiungi</translation>
     </message>
     <message>
         <source>Global</source>
         <translation>Totali</translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation>Controllare le categorie a cui questo documento appartiene.</translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation>Inserisci una nuova categoria.  Premi &lt;b&gt;Aggiungi&lt;/b&gt; per aggiungerla alla lista.</translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation>Inserisci una nuova categoria sulla sinistra e premi per aggiungerla alla lista.</translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation>Premi per cancellare la categoria evidenziata.</translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation>Spunta per rendere questa proprietà disponibile a tutte le applicazioni.</translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation>Tutte</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Vuota</translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation>Spiacente, un&apos;altra applicazione sta
 modificando le categorie.</translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation>Modifica Categorie</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tutte</translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation>Mostra Gennaio nell&apos;anno selezionato</translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation>Mostra il mese precedente</translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation>Mostra il mese successivo</translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation>Mostra Dicembre nell&apos;anno selezionato</translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation>Chiudi Selettore File</translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation>Mostra i documenti di questo tipo</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Mostra Documento</translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation>Mostra documenti in questa categoria</translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation>Premi per selezionare un documento dalla lista</translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation>, o seleziona &lt;b&gt;Nuovo Documento&lt;/b&gt; per creare un nuovo documento.</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation>&lt;br&gt;&lt;br&gt;Tieni premuto per le proprietà del documento.</translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <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>
         <source>Find what:</source>
         <translation>Trova cosa:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoria:</translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation>Inizia Ricerca da:</translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation>Dic 02 01</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Maiuscole/minuscole</translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation>Trova Indietro</translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Document View</source>
         <translation>Vista Documento</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Cancella</translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation>Cancellazione file fallita.</translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation>Copia di </translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplica</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>Copia file fallita.</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Dettagli</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>Spostamento documento fallito.</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Hard Disk</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Proprietà</translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation>Dettagli</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>Commento:</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Ubicazione:</translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation>Caricamento veloce (consuma memoria)</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Cancella</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copia</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Trasmetti via IrDA</translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation>Il supporto su cui è salvato il documento.</translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation>Il nome di questo documento.</translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation>Carica questa applicazione così da renderla istantaneamente disponibile.</translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation>Cancella questo documento.</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation>Crea una copia di questo documento.</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation>Trasmetti via IrDA questo documento.</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation>Utilizza rotazione personalizzata</translation>
     </message>
     <message>
         <source>Arguments:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>Informazioni Proprietario</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Inserisci codice</translation>
     </message>
 </context>
 <context>
     <name>QMessageBox</name>
     <message>
         <source>Yes</source>
         <translation>Sì</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Spazio Esaurito</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>Impossibile creare il file
 di configurazione per questo
 programma.
 Liberare dello spazio e
 riprovare.</translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 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>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Indirizzo Abitazione:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation>Indirizzi Email: </translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Telefono Abitazione: </translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Fax Abitazione: </translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Cellulare Abitazione: </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Pagina Web Abitazione: </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Pagina Web Lavoro: </translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Ufficio: </translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Telefono Lavoro: </translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Fax Lavoro: </translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Cellulare Lavoro: </translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Cercapersone Lavoro: </translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Professione: </translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Assistente: </translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Direttore: </translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Maschile</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Femminile</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Sesso: </translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Coniuge: </translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Compleanno: </translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Anniversario: </translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Alias: </translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Titolo</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Nome</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Secondo Nome</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Cognome</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Suffisso</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Visualizza come</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Titolo</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Dipartimento</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Società</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Telefono Lavoro</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Fax Lavoro</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Cellulare Lavoro</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>Email Principale</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>Altre Email</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Telefono Abitazione</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Fax Abitazione</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Cellulare Abitazione</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Indirizzo Lavoro</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Città Lavoro</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>Stato Lavoro</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>CAP Lavoro</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>Paese Lavoro</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Cercapersone Lavoro</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Pagina Web Lavoro</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Ufficio</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Professione</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Assistente</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Direttore</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Indirizzo Abitazione</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Città Abitazione</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>Stato Abitazione</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>CAP Abitazione</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>Paese Abitazione</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Pagina Web Abitazione</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Coniuge</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Sesso</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Compleanno</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Anniversario</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Alias</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Figli</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Note</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Gruppi</translation>
     </message>
     <message>
         <source>New Document</source>
         <translation>Nuovo Documento</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Lun</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Mar</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Mer</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Gio</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <source>Jan</source>
         <translation>Gen</translation>
     </message>
     <message>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
         <source>May</source>
         <translation>Mag</translation>
     </message>
     <message>
         <source>Jun</source>
         <translation>Giu</translation>
     </message>
     <message>
         <source>Jul</source>
         <translation>Lug</translation>
     </message>
     <message>
         <source>Aug</source>
         <translation>Ago</translation>
     </message>
     <message>
         <source>Sep</source>
         <translation>Set</translation>
     </message>
     <message>
         <source>Oct</source>
         <translation>Ott</translation>
     </message>
     <message>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
         <source>Dec</source>
         <translation>Dic</translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation type="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>
     <message>
         <source>%1 document</source>
         <translation>%1 documento</translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation type="unfinished">Premi per chiudere questa finestra, abbandonando le modifiche effettuate.</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation type="unfinished">Premi per chiudere questa finestra.</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation type="unfinished">Premi per chiudere questa finestra e salvare le modifiche effettuate.</translation>
     </message>
     <message>
         <source>Click to make this window movable.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
         <translation type="unfinished">Premi per ingrandire al massimo questa finestra.</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maximize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>Card CF</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Hard Disk</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>Card SD</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>Hard Disk SCSI</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Memoria Interna</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>Memoria Interna</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>Card MMC</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>Nessuna</translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation>eseguibile citytime non trovato</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation>Per scegliere il fuso orario,
 prego installare citytime.</translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Spazio Esaurito</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Impossibile programmare l&apos;allarme.
 Liberare dello spazio di memoria e
 riprovare</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>%1 file</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>%1 %2</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>Tutti i %1 file</translation>
     </message>
     <message>
         <source>All files</source>
         <translation>Tutti i file</translation>
     </message>
 </context>
 <context>
     <name>WindowDecoration</name>
     <message>
         <source>Default</source>
         <comment>List box text for default window decoration</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,115 +1,103 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AddressBookPluginConfig</name>
     <message>
         <source>Max Lines: </source>
         <translation>Max Linee: </translation>
     </message>
     <message>
         <source>Set the maximum number of lines that should be shown for each anniversaries/birthdays</source>
         <translation>Inserisci il numero massimo di righe che dovranno essere visualizzate per ogni anniversario/compleanno</translation>
     </message>
     <message>
-        <source>Clip line after X chars: </source>
-        <translation 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>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation>Questo colore sarà utilizzato per visualizzare i compleanni/annversari !</translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation>Imposta Colore
 &quot;Urgente&quot; sotto </translation>
     </message>
     <message>
         <source> days: </source>
         <translation> giorni: </translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation>Questo colore verrà utilizzato se siamo vicino all&apos;evento !</translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation>Questo colore verrà utilizzato se il compleanno/anniversario è più vicino dei giorni dati !</translation>
     </message>
     <message>
         <source>Enable/Disable Views</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show &amp;Birthdays</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show &amp;Anniveraries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The next birthdays will just be shown, if enabled!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The next anniversaries will just be shown, if enabled !</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>AddressBook plugin</source>
         <translation>Plugin Rubrica</translation>
     </message>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>Prossimi compleanni in &lt;b&gt; %1 &lt;/b&gt; giorni:</translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>Nessun compleanno in &lt;b&gt; %1 &lt;/b&gt; giorni!</translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>Prossimi anniversari in &lt;b&gt; %1 &lt;/b&gt; giorni:</translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>Nessun anniversario in &lt;b&gt; %1 &lt;/b&gt; giorni!</translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation>Il database non prevede questo tipo di ricerca ! Aggiorna libOpie !&lt;br&gt;</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/libtodaydatebookplugin.ts b/i18n/it/libtodaydatebookplugin.ts
index b80c691..549b468 100644
--- a/i18n/it/libtodaydatebookplugin.ts
+++ b/i18n/it/libtodaydatebookplugin.ts
@@ -1,147 +1,88 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <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>
     </message>
     <message>
         <source>Show notes</source>
         <translation>Nostra note</translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
         <translation>Spunta se deve essere mostrata per ognuno la nota associata ad un appuntamento</translation>
     </message>
     <message>
         <source>Show only later appointments</source>
         <translation>Mostra solo appuntamenti successivi</translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
         <translation>Spunta se devono essere mostrati solo i successivi appuntamenti</translation>
     </message>
     <message>
         <source>Show time in extra line</source>
         <translation>Mostra orario in linee extra</translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
         <translation>Quanti appuntamenti devono essere mostrati al massimo. In ordine cronologico</translation>
     </message>
     <message>
         <source>How many appointment should be shown?</source>
         <translation>Quanti appuntamenti devono essere mostrati?</translation>
     </message>
     <message>
         <source>only today</source>
         <translation>solo oggi</translation>
     </message>
     <message>
         <source>How many more days should be in the range</source>
         <translation>Quanti altri giorni devono essere nel campo</translation>
     </message>
     <message>
         <source>How many more days</source>
         <translation>Quanti altri giorni</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Datebook plugin</source>
         <translation>Plugin Agenda</translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation>Nessun altro appuntamento oggi</translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation>Nessun appuntamento oggi</translation>
     </message>
 </context>
 </TS>
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
@@ -1,60 +1,41 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>QObject</name>
     <message>
         <source>Todolist plugin</source>
         <translation>Plugin Impegni</translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation>C&apos;è un &lt;b&gt; 1&lt;/b&gt; nuovo impegno:  &lt;br&gt;</translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation>Ci sono &lt;b&gt; %1&lt;/b&gt; nuovi impegni: &lt;br&gt;</translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation>Nessun nuovo impegno</translation>
     </message>
 </context>
 <context>
     <name>TodoPluginConfigBase</name>
     <message>
         <source>Set the maximum number of task that should be shown</source>
         <translation>Imposta il numero massimo di impegni da mostrare</translation>
     </message>
     <message>
         <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
@@ -1,122 +1,118 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>QObject</name>
     <message>
         <source>Weather plugin</source>
         <translation>Plugin Situazione Metereologica</translation>
     </message>
 </context>
 <context>
     <name>WeatherPluginConfig</name>
     <message>
         <source>Enter ICAO location identifier:</source>
         <translation>inserire identificatore posizione ICAO:</translation>
     </message>
     <message>
         <source>Enter the 4 letter code for the desired location here.  See http://www.nws.noaa.gov/tg/siteloc.shtml to find a location near you.</source>
         <translation>Inserire qui il codice a 4 lettere del luogo scelto.  Vai su http://www.nws.noaa.gov/tg/siteloc.shtml per trovare il luogo a te più vicino.</translation>
     </message>
     <message>
         <source>Visit http://www.nws.noaa.gov/tg/siteloc.shtml to find the nearest location.</source>
         <translation>Vai su http://www.nws.noaa.gov/tg/siteloc.shtml per trovare il luogo a te più vicino.</translation>
     </message>
     <message>
         <source>Use metric units</source>
         <translation>Usa unità di metro</translation>
     </message>
     <message>
         <source>Click here to select type of units displayed.</source>
         <translation>Premi qui per selezionare il tipo di unità visualizzata.</translation>
     </message>
     <message>
         <source>Update frequency (in minutes):</source>
         <translation>Frequenza di aggiornamento (in minuti):</translation>
     </message>
     <message>
         <source>Select how often (in minutes) you want the weather to be updated.</source>
         <translation>Seleziona quanto spesso (in minuti) vuoi che il tempo sia aggiornato.</translation>
     </message>
 </context>
 <context>
     <name>WeatherPluginWidget</name>
     <message>
         <source>Retreiving current weather information.</source>
         <translation>Aggiornamento situazione metereologica.</translation>
     </message>
     <message>
         <source>Temp: </source>
         <translation>Temp: </translation>
     </message>
     <message>
         <source>  Wind: </source>
         <translation>  Vento: </translation>
     </message>
     <message>
         <source>
 Pres: </source>
         <translation>
 Pres: </translation>
     </message>
     <message>
         <source>Current weather data not available.</source>
         <translation>Dati sulla situazione metereologica non disponibili.</translation>
     </message>
     <message>
         <source>n/a</source>
         <translation>n/d</translation>
     </message>
     <message>
         <source>E </source>
         <translation>E </translation>
     </message>
     <message>
         <source>NE </source>
         <translation>NE </translation>
     </message>
     <message>
         <source>N </source>
         <translation>N </translation>
     </message>
     <message>
         <source>NW </source>
         <translation>NO </translation>
     </message>
     <message>
         <source>W </source>
         <translation>O </translation>
     </message>
     <message>
         <source>SW </source>
         <translation>SO </translation>
     </message>
     <message>
         <source>S </source>
         <translation>S </translation>
     </message>
     <message>
         <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
@@ -1,49 +1,37 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>MindBreaker</name>
     <message>
         <source>New Game</source>
         <translation>Nuova Partita</translation>
     </message>
     <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>
         <source>Cancel</source>
         <translation>Cancella</translation>
     </message>
 </context>
 </TS>
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,37 +1,33 @@
 <!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>
         <source>Game</source>
         <translation>Livello</translation>
     </message>
     <message>
         <source>Mine Sweep</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -411,523 +411,503 @@
     <message>
         <source>Device</source>
         <translation>Dispositivo</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Configure Profiles</source>
         <translation>Configura Profili</translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation>Nuova Connessione</translation>
     </message>
     <message>
         <source>Save Connection</source>
         <translation>Salva Connessione</translation>
     </message>
     <message>
         <source>Connect</source>
         <translation>Connetti</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>Disconnetti</translation>
     </message>
     <message>
         <source>QuickLaunch</source>
         <translation>QuickLaunch</translation>
     </message>
     <message>
         <source>The shell button launches the &quot;default&quot; profile. If there is none default values are taken</source>
         <translation>Il pulsante della shell lancia il profilo &quot;predefinito&quot;. Se non esiste saranno utilizzati i valori predefiniti</translation>
     </message>
     <message>
         <source>Transfer file...</source>
         <translation>Trasferisci file...</translation>
     </message>
     <message>
         <source>Line wrap</source>
         <translation>A capo automatico</translation>
     </message>
     <message>
         <source>Full screen</source>
         <translation>Schermo intero</translation>
     </message>
     <message>
         <source>Save history</source>
         <translation>Salva cronologia</translation>
     </message>
     <message>
         <source>Terminate</source>
         <translation>Termina</translation>
     </message>
     <message>
         <source>Close Window</source>
         <translation>Chiudi Finestra</translation>
     </message>
     <message>
         <source>Run Script</source>
         <translation>Esegui Script</translation>
     </message>
     <message>
         <source>Record Script</source>
         <translation>Registra Script</translation>
     </message>
     <message>
         <source>Save Script</source>
         <translation>Salva Script</translation>
     </message>
     <message>
         <source>Open Keyboard...</source>
         <translation>Apri Tastiera...</translation>
     </message>
     <message>
         <source>New from Profile</source>
         <translation>Nuovo da Profilo</translation>
     </message>
     <message>
         <source>Connection</source>
         <translation>Connessione</translation>
     </message>
     <message>
         <source>Scripts</source>
         <translation>Scripts</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copia</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Incolla</translation>
     </message>
     <message>
         <source>Script</source>
         <translation>Script</translation>
     </message>
     <message>
         <source>&lt;qt&gt;There is no Connection.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Non Connesso.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>History</source>
         <translation>Cronologia</translation>
     </message>
     <message>
         <source>New Profile</source>
         <translation>Nuovo Profilo</translation>
     </message>
     <message>
         <source>Save Profile</source>
         <translation>Salva Profilo</translation>
     </message>
     <message>
         <source>Start log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Log</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModemConfigWidget</name>
     <message>
         <source>Modem is attached to:</source>
         <translation>Modem collegato a:</translation>
     </message>
     <message>
         <source>Enter telefon number here:</source>
         <translation>Inserisci numero telefonico:</translation>
     </message>
     <message>
         <source>AT commands</source>
         <translation>Comandi AT</translation>
     </message>
     <message>
         <source>Enter number</source>
         <translation>Inserisci numero</translation>
     </message>
 </context>
 <context>
     <name>NoOptions</name>
     <message>
         <source>This Plugin does not support any configurations</source>
         <translation>Questo plugin non supporta nessuna configurazione</translation>
     </message>
 </context>
 <context>
     <name>ProfileEditorDialog</name>
     <message>
         <source>New Profile</source>
         <translation>Nuovo Profilo</translation>
     </message>
     <message>
         <source>Connection</source>
         <translation>Connessione</translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation>Terminale</translation>
     </message>
     <message>
         <source>Auto connect after load</source>
         <translation>Connessione automatica dopo il caricamento</translation>
     </message>
     <message>
         <source>Local Console</source>
         <translation>Console Locale</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Opie Console</source>
         <translation>Console Opie</translation>
     </message>
     <message>
         <source>Failed</source>
         <translation>Fallita</translation>
     </message>
     <message>
         <source>Connecting failed for this session.</source>
         <translation>Connessione fallita per questa sessione.</translation>
     </message>
     <message>
         <source>Session failed</source>
         <translation>Sessione fallita</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Cannot open session: Not all components were found.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Impossibile aprire la sessione: Non sono stati trovati tutti i componenti.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Transfer mode</source>
         <translation>Modalità traferimento</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Invia</translation>
     </message>
     <message>
         <source>Receive</source>
         <translation>Ricevi</translation>
     </message>
     <message>
         <source>Send file</source>
         <translation>Invia file</translation>
     </message>
     <message>
         <source>Transfer protocol</source>
         <translation>Protocollo di trasferimento</translation>
     </message>
     <message>
         <source>Progress</source>
         <translation>Stato di avanzamento</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Stato</translation>
     </message>
     <message>
         <source>Ready</source>
         <translation>Pronto</translation>
     </message>
     <message>
         <source>Start transfer</source>
         <translation>Inizio trasferimento</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Cancella</translation>
     </message>
     <message>
         <source>File transfer</source>
         <translation>Trasferimento File</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation>Attenzione</translation>
     </message>
     <message>
         <source>No file has been specified.</source>
         <translation>Non è stato specificato alcun file.</translation>
     </message>
     <message>
         <source>Sending...</source>
         <translation>In trasmissione...</translation>
     </message>
     <message>
         <source>Receiving...</source>
         <translation>In ricezione...</translation>
     </message>
     <message>
         <source>Cancelled</source>
         <translation>Cancellato</translation>
     </message>
     <message>
         <source>The file transfer has been cancelled.</source>
         <translation>Il trasferimento file è stato cancellato.</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
         <source>Operation not supported.</source>
         <translation>Operazione non supportata.</translation>
     </message>
     <message>
         <source>Transfer could not be started.</source>
         <translation>Il Trasferimento non può essere iniziato.</translation>
     </message>
     <message>
         <source>No error.</source>
         <translation>Nessun errore.</translation>
     </message>
     <message>
         <source>Undefined error occured.</source>
         <translation>Si è verificato un errore indefinito.</translation>
     </message>
     <message>
         <source>Incomplete transfer.</source>
         <translation>Trasferimento non completato.</translation>
     </message>
     <message>
         <source>Unknown error occured.</source>
         <translation>Si è verificato un errore sconosciuto.</translation>
     </message>
     <message>
         <source>Sent</source>
         <translation>Invia</translation>
     </message>
     <message>
         <source>File has been sent.</source>
         <translation>Il file è stato inviato.</translation>
     </message>
     <message>
         <source>Received</source>
         <translation>Ricevuto</translation>
     </message>
     <message>
         <source>File has been received.</source>
         <translation>Il file è stato ricevuto.</translation>
     </message>
     <message>
         <source>Profile name</source>
         <translation>Nome profilo</translation>
     </message>
     <message>
         <source>Profile</source>
         <translation>Profilo</translation>
     </message>
     <message>
         <source>Connection</source>
         <translation>Connessione</translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation>Terminale</translation>
     </message>
     <message>
         <source>Special Keys</source>
         <translation>Tasti Speciali</translation>
     </message>
     <message>
         <source>Invalid profile</source>
         <translation>Profilo non valido</translation>
     </message>
     <message>
         <source>Please enter a profile name.</source>
         <translation>Inserisci un nome per il profilo.</translation>
     </message>
     <message>
         <source>Z-Modem</source>
         <translation>Z-Modem</translation>
     </message>
     <message>
         <source>Y-Modem</source>
         <translation>Y-Modem</translation>
     </message>
     <message>
         <source>X-Modem</source>
         <translation>X-Modem</translation>
     </message>
     <message>
         <source>Serial</source>
         <translation>Seriale</translation>
     </message>
     <message>
         <source>Modem</source>
         <translation>Modem</translation>
     </message>
     <message>
         <source>Local Console</source>
         <translation>Console Locale</translation>
     </message>
     <message>
         <source>Default Terminal</source>
         <translation>Terminale Predefinito</translation>
     </message>
     <message>
         <source>Default Keyboard</source>
         <translation>Tastiera Predefinita</translation>
     </message>
     <message>
         <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>
         <source>Reset speakers</source>
         <translation>Reset speaker</translation>
     </message>
     <message>
         <source>Turning off dialtone</source>
         <translation>Disabilitazione toni</translation>
     </message>
     <message>
         <source>Dial number</source>
         <translation>Componi numero</translation>
     </message>
     <message>
         <source>Line busy, redialing number</source>
         <translation>Linea occupata, ricomposizione numero</translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation>Connessione stabilita</translation>
     </message>
     <message>
         <source>Dismiss</source>
         <translation>Esci</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Dialing the number failed.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fixing up Embedix</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SerialConfigWidget</name>
     <message>
         <source>Device</source>
         <translation>Dispositivo</translation>
     </message>
 </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>
         <source>Options</source>
         <translation>Opzioni</translation>
     </message>
     <message>
         <source>Local echo</source>
         <translation>Echo locale</translation>
     </message>
     <message>
         <source>Line wrap</source>
         <translation>A capo automatico</translation>
     </message>
     <message>
         <source>VT 100</source>
         <translation>VT 100</translation>
     </message>
     <message>
         <source>VT 102</source>
         <translation>VT 102</translation>
     </message>
     <message>
         <source>Linux Console</source>
         <translation>Console Linux</translation>
     </message>
     <message>
         <source>X-Terminal</source>
         <translation>Terminale X</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>green on black</source>
         <translation>verde su nero</translation>
     </message>
     <message>
         <source>orange on black</source>
         <translation>arancione su nero</translation>
     </message>
 </context>
 </TS>
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
@@ -1,300 +1,328 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BaseSetup</name>
     <message>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slideshow timeout:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Toggle autoscale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to next image</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Delete Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Image Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></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>Browser Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Keyboard Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie Eye - Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Imageinfo Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Imageview Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Go dir up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start slideshow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and Imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show images fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto rotate images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show images unscaled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show zoomer window when unscaled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
     <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>
         <source>&lt;center&gt;&lt;b&gt;Be carefull with the following options!&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show files recursive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recursion depth:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Digital Camera View</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Name Only</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>imageinfo</name>
     <message>
         <source>View Full Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays an thumbnail of the image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays info of selected image</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,148 +1,126 @@
 <!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>
         <source>User</source>
         <translation>Utente</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Password</translation>
     </message>
     <message>
         <source>Suspend</source>
         <translation>Sospendi</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Menu</translation>
     </message>
 </context>
 <context>
     <name>LoginWindowImpl</name>
     <message>
         <source>Restart</source>
         <translation>Riavvia</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>Esci</translation>
     </message>
     <message>
-        <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
-        <translation type="obsolete">&lt;center&gt;%1 %2&lt;/center&gt;</translation>
-    </message>
-    <message>
         <source>Wrong password</source>
         <translation>Password errata</translation>
     </message>
     <message>
         <source>The given password is incorrect.</source>
         <translation>La password inserita non è corretta.</translation>
     </message>
     <message>
-        <source>OPIE was terminated
-by an uncaught signal
-(%1)
-</source>
-        <translation type="obsolete">OPIE è stato terminato
-da un segnale
-(%1)
-</translation>
-    </message>
-    <message>
         <source>Failure</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <source>Could not start OPIE.</source>
-        <translation type="obsolete">Impossibile inizializzare OPIE.</translation>
-    </message>
-    <message>
         <source>Could not switch to new user identity</source>
         <translation>Impossibile cambiare utente</translation>
     </message>
     <message>
         <source>Opie was terminated
 by an uncaught signal
 (%1)
 </source>
         <translation>Opie è stato terminato
 da un segnale
 (%1)</translation>
     </message>
     <message>
         <source>Could not start Opie.</source>
         <translation>Impossibile inizializzare Opie.</translation>
     </message>
 </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>
     <message>
         <source>&lt;b&gt;Password:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Confirm:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PasswordDialogImpl</name>
     <message>
         <source>Trying to leave without password set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;No password was set. This could lead to you not beeingable to remotely connect to your machine.Do you want to continue not setting a password?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passwords don&apos;t match</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The two passwords don&apos;t match. Please try again.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password not legal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The entered password is not a valid password.Please try entering a valid password.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,754 +1,722 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>DCCProgress</name>
     <message>
         <source>Receiving file %1 from %2...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully received %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Peer Aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Timeout</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DCCTransferTab</name>
     <message>
         <source>DCC Transfers in Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are transfers in progress. &lt;br&gt;If you close this tab, they will be canceled.&lt;br&gt;Do you want to close it anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DCC Transfer from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is trying to send you the file %2
 (%3 bytes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Reject</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCChannelTab</name>
     <message>
         <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>
         <source>Whois</source>
         <translation>Whois</translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation>Disconnesso</translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
         <translation>Connesso, accesso in corso ..</translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
         <translation>Accesso avvenuto.</translation>
     </message>
     <message>
         <source>Socket error : </source>
         <translation>Errore di socket : </translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation>Connessione terminata</translation>
     </message>
 </context>
 <context>
     <name>IRCHistoryLineEdit</name>
     <message>
         <source>Next Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <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>Nonexistant channel join - desynchronized?</source>
         <translation>Connessione ad un canale inesistente - non sicronizzato?</translation>
     </message>
     <message>
         <source>Person has already joined the channel - desynchronized?</source>
         <translation>Utente già presente nel canale - non sincronizzato?</translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
         <translation>Sei già presente nel canale - non sincronizzato?</translation>
     </message>
     <message>
         <source>Parting person not found - desynchronized?</source>
         <translation>Utente non trovato - non sincronizzato?</translation>
     </message>
     <message>
         <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>
         <source>Mode change has unknown type</source>
         <translation>Tipo sconosciuto per cambio modalità</translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
         <translation>Cambio modalità con utente sconosciuto - Non sincronizzato?</translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
         <translation>Cambio modalità con parametro sconosciuto</translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
         <translation>Cambio modalità con canale sconosciuto - Non sincronizzato?</translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
         <translation>Modalità dell&apos;utente non ancora supportati</translation>
     </message>
     <message>
         <source>You were kicked from </source>
         <translation>Sei stato scacciato da </translation>
     </message>
     <message>
         <source> by </source>
         <translation> da </translation>
     </message>
     <message>
         <source> was kicked from </source>
         <translation> è stato scacciato da </translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
         <translation>Utente sconosciuto scacciato - non sincronizzato?</translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
         <translation>Canale sconosciuto scacciato - non sincronizzato?</translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
         <translation>Messaggio server con canale sconosciuto</translation>
     </message>
     <message>
         <source>You joined channel </source>
         <translation>Sei entrato nel canale </translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
         <translation>Questo nickname è già utilizzato, riconnettersi utilizzando un nickname diverso</translation>
     </message>
     <message>
         <source>No such nickname</source>
         <translation>Nickname sconosciuto</translation>
     </message>
     <message>
         <source>Received unhandled numeric command: %1</source>
         <translation>Ricevuto comando numerico sconosciuto: %1</translation>
     </message>
     <message>
         <source>Received unhandled ctcp command: %1</source>
         <translation>Ricevuto comando ctcp sconosciuto: %1</translation>
     </message>
     <message>
         <source>Received unhandled literal command: %1</source>
         <translation>Ricevuto comando alfabetico sconosciuto: %1</translation>
     </message>
     <message>
         <source>%1 joined channel %2</source>
         <translation>%1 è entrato nel canale %2</translation>
     </message>
     <message>
         <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>
         <source>There are %1 unknown connection(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are %1 channels formed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait a while and try again</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Whois %1 (%2@%3)
 Real name: %4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is using server %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is on channels: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Names for %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time on server %1 is %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel or nick %1 doesn&apos;t exists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is no history information for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t change nick to %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You&apos;re not on channel %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>[%1] Operation not permitted, you don&apos;t have enough channel privileges</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connected to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 has been idle for %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 signed on %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP PING with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP PING with unknown channel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP PING with bad recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP VERSION request from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING reply from %1: %2 seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malformed DCC request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
         <translation>In conversazione con </translation>
     </message>
     <message>
         <source>Private discussion</source>
         <translation>Conversazione privata</translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
         <translation>Digita qui il tuo messaggio da inviare ad un&apos;altra persona</translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation>Disconnesso</translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
         <translation>Nome profilo :</translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
         <translation>Il nome del profilo di questo server</translation>
     </message>
     <message>
         <source>Hostname :</source>
         <translation>Hostname :</translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
         <translation>Il server a cui connettersi - può essere un qualunque IP o nome host valido</translation>
     </message>
     <message>
         <source>Port :</source>
         <translation>Porta :</translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
         <translation>La porta del server a cui connettersi. Normalmente la 6667</translation>
     </message>
     <message>
         <source>Nickname :</source>
         <translation>Nickname :</translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
         <translation>Il tuo alias sul network IRC</translation>
     </message>
     <message>
         <source>Realname :</source>
         <translation>Nome reale :</translation>
     </message>
     <message>
         <source>Your real name</source>
         <translation>Il tuo nome reale</translation>
     </message>
     <message>
         <source>Password :</source>
         <translation>Password :</translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
         <translation>La password per connettersi al server (se richiesta)</translation>
     </message>
     <message>
         <source>Channels :</source>
         <translation>Canali :</translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
         <translation>Lista di tutti i canali (separati da virgola) a cui vuoi connetterti automaticamente</translation>
     </message>
     <message>
         <source>Edit server information</source>
         <translation>Modifica informazioni del server</translation>
     </message>
     <message>
         <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>
         <translation>Browser lista server</translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
         <translation>Seleziona un profilo server</translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
         <translation>Seleziona da questa lista un profilo server e premi OK in alto a destra</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Elimina</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Modifica</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Aggiungi</translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
         <translation>Elimina il profilo server corrente</translation>
     </message>
     <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>
 <context>
     <name>IRCSession</name>
     <message>
         <source>You are now known as %1</source>
         <translation type="unfinished">Sei conosciuto ora come %1</translation>
     </message>
     <message>
         <source>Nickname change of an unknown person</source>
         <translation type="unfinished">Nickname di un utente sconosciuto modificato</translation>
     </message>
     <message>
         <source>%1 is now known as %2</source>
         <translation type="unfinished">%1 è ora conosciuto come %2</translation>
     </message>
 </context>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Lines displayed :</source>
         <translation>Linee visualizzate :</translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
         <translation>Numero di righe visualizzate nelle chat prima che le righe più vecchie vengano cancellate - è necessario per limitare l&apos;occupazione di memoria. Imposta a 0 se non ne hai bisogno</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Generale</translation>
     </message>
     <message>
         <source>Background color :</source>
         <translation>Colore sfondo :</translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
         <translation>Colore dello sfondo da utilizzare nelle chat</translation>
     </message>
     <message>
         <source>Normal text color :</source>
         <translation>Colore testo normale :</translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
         <translation>Colore del testo da utilizzare nelle chat</translation>
     </message>
     <message>
         <source>Error color :</source>
         <translation>Colore errore :</translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
         <translation>Colore da utilizzare per visualizzare gli errori</translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
         <translation>Testo scritto da te :</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
         <translation>Colore da utilizzare per evidenziare il testo scritto da te</translation>
     </message>
     <message>
         <source>Text written by others :</source>
         <translation>Testo scritto da altri :</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
         <translation>Colore da utilizzare per evidenziare il testo scritto da altri</translation>
     </message>
     <message>
         <source>Text written by the server :</source>
         <translation>Testo scritto dal server :</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
         <translation>Colore da utilizzare per evidenziare il testo scritto dal server</translation>
     </message>
     <message>
         <source>Notifications :</source>
         <translation>Notifiche :</translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
         <translation>Colore da utilizzare per evidenziare le notifiche</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Colori</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Impostazioni</translation>
     </message>
     <message>
         <source>Display time in chat log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Keyboard Shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCTab</name>
     <message>
         <source>Missing description</source>
         <translation>Descrizione mancante</translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
         <translation>Descrizione del contenuto del tab</translation>
     </message>
     <message>
         <source>Close this tab</source>
         <translation>Chiudi questo tab</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
         <translation>Client IRC</translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
         <translation>Connessioni al server, canali, query ed altre cose saranno posizionate qui</translation>
     </message>
     <message>
         <source>IRC</source>
         <translation>IRC</translation>
     </message>
     <message>
         <source>New connection</source>
         <translation>Nuova connessione</translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
         <translation>Crea una nuova connessione ad un server IRC</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Impostazioni</translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
         <translation>Configura impostazioni di OpieIRC</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source> User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie IRC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> gives channel operator status to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> removes channel operator status from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> gives voice to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> removes voice from </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,817 +1,878 @@
 <!DOCTYPE TS><TS>
 <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>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerUI</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposeMail</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please create an SMTP account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a File.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Store message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Store message into drafts?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Attachments will not be stored in &quot;Draft&quot; folder&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Receiver specified</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposeMailUI</name>
     <message>
         <source>Compose Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>send later</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>use:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BCC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <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>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>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete the selected Account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select an account.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccountsUI</name>
     <message>
         <source>Configure Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>News</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IMAPconfigUI</name>
     <message>
         <source>Configure IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefix</source>
         <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>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>
     </message>
     <message>
         <source>Send queued mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show/Hide folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Newsgroups</source>
         <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>
     </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>
 <context>
     <name>NNTPconfigUI</name>
     <message>
         <source>Configure NNTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Newsgroup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get newsgroup list from server</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Newmdirdlgui</name>
     <message>
         <source>Enter directory name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directory name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directory contains other subdirs</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <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>
     </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>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></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>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec imapd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>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>
     </message>
     <message>
         <source>Use Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the SMTP Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port of the SMTP Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SelectMailTypeUI</name>
     <message>
         <source>Select Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Account Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>POP3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SMTP</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SettingsDialogUI</name>
     <message>
         <source>Settings Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View mail as Html</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compose Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mails later ( enqueue in outbox )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></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>
     </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>
     </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>
     </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>
     </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>
     </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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Store mail(s) to&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Folder:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create new folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefix will prepend, no need to enter it!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move mail(s)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,229 +1,155 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>HelpWindow</name>
     <message>
         <source>Backward</source>
         <translation>Indietro</translation>
     </message>
     <message>
         <source>Forward</source>
         <translation>Avanti</translation>
     </message>
 </context>
 <context>
     <name>QtRec</name>
     <message>
         <source>OpieRecord </source>
         <translation>OpieRecord </translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Elimina</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
         <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>
         <source>Volume</source>
         <translation>Volume</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <source>Send with Ir</source>
         <translation>Invia con Ir</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Rinomina</translation>
     </message>
     <message>
         <source>Ir Beam out</source>
         <translation>Invia via Ir</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>Invio Ir effettuato.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
-        <source>Rec</source>
-        <translation 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>
         <source>Please select file to play</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,152 +1,132 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>MainWindow</name>
     <message>
         <source>OSearch</source>
         <translation>OSearch</translation>
     </message>
     <message>
         <source>The details of the current result</source>
         <translation>Dettagli selezione corrente</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Applicazioni</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Documenti</translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation>Attività</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Agenda</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Contatti</translation>
     </message>
     <message>
         <source>Search</source>
         <translation>Cerca</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Impostazioni</translation>
     </message>
     <message>
         <source>Search all</source>
         <translation>Cerca tutto</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opzioni</translation>
     </message>
     <message>
-        <source>Case sensitiv</source>
-        <translation 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>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case sensitive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OListView</name>
     <message>
         <source>Results</source>
         <translation>Risultati</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <source>show completed tasks</source>
-        <translation 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>
         <source>open in filemanager</source>
         <translation>aprin nel filemanager</translation>
     </message>
     <message>
         <source>File: </source>
         <translation>File: </translation>
     </message>
     <message>
         <source>Link: </source>
         <translation>Link: </translation>
     </message>
     <message>
         <source>Mimetype: </source>
         <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>
         <source>Search in dates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search content</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,452 +1,440 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>CalcDlg</name>
     <message>
         <source>Calculate</source>
         <translation>Calcola</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>Cancella</translation>
     </message>
     <message>
         <source>Molecular Weight</source>
         <translation>Peso Molecolare</translation>
     </message>
     <message>
         <source>Molecular Weight (u):</source>
         <translation>Peso Molecolare (u):</translation>
     </message>
     <message>
         <source>Elemental Composition (%):</source>
         <translation>Composizione Molecolare (%):</translation>
     </message>
     <message>
         <source>Chemical Formula</source>
         <translation>Formula Chimica</translation>
     </message>
     <message>
         <source>CalcDlg</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OxydataWidget</name>
     <message>
         <source>Block</source>
         <translation>Blocco</translation>
     </message>
     <message>
         <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>
         <source>%1 pm</source>
         <translation>%1 pm</translation>
     </message>
     <message>
         <source>%1 g/cm^3</source>
         <translation>%1 g/cm^3</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation>Peso</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>
 <context>
     <name>Oxygen</name>
     <message>
         <source>Oxygen</source>
         <translation>Ossigeno</translation>
     </message>
     <message>
         <source>PSE</source>
         <translation>PSE</translation>
     </message>
     <message>
         <source>Data</source>
         <translation>Dati</translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation>Calcoli</translation>
     </message>
     <message>
         <source>Hydrogen</source>
         <translation>Idrogeno</translation>
     </message>
     <message>
         <source>Helium</source>
         <translation>Elio</translation>
     </message>
     <message>
         <source>Lithium</source>
         <translation>Litio</translation>
     </message>
     <message>
         <source>Beryllium</source>
         <translation>Berillio</translation>
     </message>
     <message>
         <source>Boron</source>
         <translation>Boro</translation>
     </message>
     <message>
         <source>Carbon</source>
         <translation>Carbonio</translation>
     </message>
     <message>
         <source>Nitrogen</source>
         <translation>Azoto</translation>
     </message>
     <message>
         <source>Fluorine</source>
         <translation>Fluoro</translation>
     </message>
     <message>
         <source>Neon</source>
         <translation>Neon</translation>
     </message>
     <message>
         <source>Sodium</source>
         <translation>Sodio</translation>
     </message>
     <message>
         <source>Magnesium</source>
         <translation>Magnesio</translation>
     </message>
     <message>
         <source>Aluminum</source>
         <translation>Alluminio</translation>
     </message>
     <message>
         <source>Silicon</source>
         <translation>Silicio</translation>
     </message>
     <message>
         <source>Phosphorus</source>
         <translation>Fosforo</translation>
     </message>
     <message>
         <source>Sulfur</source>
         <translation>Zolfo</translation>
     </message>
     <message>
         <source>Chlorine</source>
         <translation>Cloro</translation>
     </message>
     <message>
         <source>Argon</source>
         <translation>Argon</translation>
     </message>
     <message>
         <source>Potassium</source>
         <translation>Potassio</translation>
     </message>
     <message>
         <source>Calcium</source>
         <translation>Calcio</translation>
     </message>
     <message>
         <source>Scandium</source>
         <translation>Scandio</translation>
     </message>
     <message>
         <source>Titanium</source>
         <translation>Titanio</translation>
     </message>
     <message>
         <source>Vanadium</source>
         <translation>Vanadio</translation>
     </message>
     <message>
         <source>Chromium</source>
         <translation>Cromo</translation>
     </message>
     <message>
         <source>Manganese</source>
         <translation>Manganese</translation>
     </message>
     <message>
         <source>Iron</source>
         <translation>Ferro</translation>
     </message>
     <message>
         <source>Cobalt</source>
         <translation>Cobalto</translation>
     </message>
     <message>
         <source>Nickel</source>
         <translation>Nichel</translation>
     </message>
     <message>
         <source>Copper</source>
         <translation>Rame</translation>
     </message>
     <message>
         <source>Zinc</source>
         <translation>Zinco</translation>
     </message>
     <message>
         <source>Gallium</source>
         <translation>Gallio</translation>
     </message>
     <message>
         <source>Germanium</source>
         <translation>Germanio</translation>
     </message>
     <message>
         <source>Arsenic</source>
         <translation>Arsenico</translation>
     </message>
     <message>
         <source>Selenium</source>
         <translation>Selenio</translation>
     </message>
     <message>
         <source>Bromine</source>
         <translation>Bromo</translation>
     </message>
     <message>
         <source>Krypton</source>
         <translation>Crypton</translation>
     </message>
     <message>
         <source>Rubidium</source>
         <translation>Rubidio</translation>
     </message>
     <message>
         <source>Strontium</source>
         <translation>Stronzio</translation>
     </message>
     <message>
         <source>Yttrium</source>
         <translation>Ittrio</translation>
     </message>
     <message>
         <source>Zirconium</source>
         <translation>Zirconio</translation>
     </message>
     <message>
         <source>Niobium</source>
         <translation>Niobio</translation>
     </message>
     <message>
         <source>Molybdenum</source>
         <translation>Molibdeno</translation>
     </message>
     <message>
         <source>Technetium</source>
         <translation>Tecnezio</translation>
     </message>
     <message>
         <source>Ruthenium</source>
         <translation>Rutenio</translation>
     </message>
     <message>
         <source>Rhodium</source>
         <translation>Rodio</translation>
     </message>
     <message>
         <source>Palladium</source>
         <translation>Palladio</translation>
     </message>
     <message>
         <source>Silver</source>
         <translation>Argento</translation>
     </message>
     <message>
         <source>Cadmium</source>
         <translation>Cadmio</translation>
     </message>
     <message>
         <source>Indium</source>
         <translation>Indio</translation>
     </message>
     <message>
         <source>Tin</source>
         <translation>Stagno</translation>
     </message>
     <message>
         <source>Antimony</source>
         <translation>Antimonio</translation>
     </message>
     <message>
         <source>Tellurium</source>
         <translation>Tellurio</translation>
     </message>
     <message>
         <source>Iodine</source>
         <translation>Iodio</translation>
     </message>
     <message>
         <source>Xenon</source>
         <translation>Xeno</translation>
     </message>
     <message>
         <source>Cesium</source>
         <translation>Cesio</translation>
     </message>
     <message>
         <source>Barium</source>
         <translation>Bario</translation>
     </message>
     <message>
         <source>Lanthanum</source>
         <translation>Lantanio</translation>
     </message>
     <message>
         <source>Cerium</source>
         <translation>Cerio</translation>
     </message>
     <message>
         <source>Praseodymium</source>
         <translation>Praseodimio</translation>
     </message>
     <message>
         <source>Neodymium</source>
         <translation>Neodimio</translation>
     </message>
     <message>
         <source>Promethium</source>
         <translation>Promezio</translation>
     </message>
     <message>
         <source>Samarium</source>
         <translation>Samario</translation>
     </message>
     <message>
         <source>Europium</source>
         <translation>Europio</translation>
     </message>
     <message>
         <source>Gadolinium</source>
         <translation>Gadolinio</translation>
     </message>
     <message>
         <source>Terbium</source>
         <translation>Terbio</translation>
     </message>
     <message>
         <source>Dysprosium</source>
         <translation>Disprosio</translation>
     </message>
     <message>
         <source>Holmium</source>
         <translation>Olmio</translation>
     </message>
     <message>
         <source>Erbium</source>
         <translation>Erbio</translation>
     </message>
     <message>
         <source>Thulium</source>
         <translation>Tulio</translation>
     </message>
     <message>
         <source>Ytterbium</source>
         <translation>Itterbio</translation>
     </message>
     <message>
         <source>Lutetium</source>
         <translation>Lutezio</translation>
     </message>
     <message>
         <source>Hafnium</source>
         <translation>Afnio</translation>
     </message>
     <message>
         <source>Tantalum</source>
         <translation>Tantalio</translation>
     </message>
     <message>
         <source>Tungsten</source>
         <translation>Tungsteno</translation>
     </message>
     <message>
         <source>Rhenium</source>
         <translation>Renio</translation>
     </message>
     <message>
         <source>Osmium</source>
         <translation>Osmio</translation>
     </message>
     <message>
         <source>Iridium</source>
         <translation>Iridio</translation>
     </message>
     <message>
         <source>Platinum</source>
         <translation>Platino</translation>
     </message>
     <message>
         <source>Gold</source>
         <translation>Oro</translation>
     </message>
     <message>
         <source>Mercury</source>
         <translation>Mercurio</translation>
     </message>
     <message>
         <source>Thallium</source>
         <translation>Tallio</translation>
     </message>
     <message>
         <source>Lead</source>
         <translation>Piombo</translation>
     </message>
     <message>
         <source>Bismuth</source>
         <translation>Bismuto</translation>
     </message>
     <message>
         <source>Polonium</source>
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
@@ -1,98 +1,74 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>CanvasCardWindow</name>
     <message>
         <source>Patience</source>
         <translation>Patience</translation>
     </message>
     <message>
         <source>Freecell</source>
         <translation>Freecell</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>
         <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>
         <source>Snap to position</source>
         <translation>Metti in posizione</translation>
     </message>
     <message>
         <source>Turn one card</source>
         <translation>Gira una carta</translation>
     </message>
     <message>
         <source>Turn three cards</source>
         <translation>Gira tre carte</translation>
     </message>
 </context>
 </TS>
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
@@ -1,595 +1,416 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished">Problema Applicazione</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;%1 non risponde.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Vuoi forzare l&apos;applicazione ad uscire?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <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>
 <context>
     <name>FirstUse</name>
     <message>
         <source>&lt;&lt; Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next &gt;&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap anywhere on the screen to continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait, loading %1 settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finish</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputMethods</name>
     <message>
         <source>Unicode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation type="unfinished">Launcher</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished"> - Launcher</translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished">Nessuna applicazione</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished">&lt;p&gt;Nessuna applicazione è definita per questo documento.&lt;p&gt;Il tipo è %1.</translation>
     </message>
     <message>
-        <source>Finding documents</source>
-        <translation type="obsolete">Ricerca documenti</translation>
-    </message>
-    <message>
-        <source>Searching documents</source>
-        <translation type="obsolete">Ricerca documenti</translation>
-    </message>
-    <message>
         <source>Documents</source>
         <translation type="unfinished">Documenti</translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>Icon View</source>
         <translation type="unfinished">Mostra Icone</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished">Mostra Lista</translation>
     </message>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
-        <source>%1 files</source>
-        <translation type="obsolete">%1 file</translation>
-    </message>
-    <message>
-        <source>All types of file</source>
-        <translation type="obsolete">Tutti i tipi di file</translation>
-    </message>
-    <message>
         <source>Document View</source>
         <translation type="unfinished">Mostra Documento</translation>
     </message>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>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>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished">Tutti</translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished">Immagine</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished">Testo</translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished">Video</translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished">Aggiungi</translation>
     </message>
     <message>
         <source>Remove</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">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>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Server</name>
     <message>
         <source>USB Lock</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation type="unfinished">Informazioni</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;La data di sistema non sembra essere corretta.
 (%1)&lt;/p&gt;&lt;p&gt;Vuoi reimpostare l&apos;orologio ?&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>Battery level is critical!
-Keep power off until power restored!</source>
-        <translation type="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>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Critical Memory Shortage
 Please end this application
 immediately.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WARNING</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The battery is running very low. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The Back-up battery is very low&lt;p&gt;Please charge the back-up battery</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation type="unfinished">Chiudi</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation type="unfinished">Chiudi Opie</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation type="unfinished">Riavvia</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation type="unfinished">Riavvia Opie</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation type="unfinished">Sospendi</translation>
     </message>
     <message>
-        <source>&lt;p&gt;
-These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
-        <translation type="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
@@ -1,409 +1,245 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>LoginBase</name>
     <message>
         <source>LoginBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login</source>
         <translation type="unfinished">Login</translation>
     </message>
     <message>
         <source>Login Automatically</source>
         <translation type="unfinished">Login Automatico</translation>
     </message>
     <message>
         <source>If you select this option, opie-login will automagically log you in with the user you have selected in the drop-down list.  
 
 For the Zaurus 5x00 this is always the user &quot;root&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This drop-down list allows you to select the user for auto-login
 (if enabled above).  
 
 You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MultiauthConfig</name>
     <message>
         <source>Security configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the order they will appear in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login</source>
         <translation type="unfinished">Login</translation>
     </message>
     <message>
         <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>
         <source>Locking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></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-securityplugin-*&lt;/em&gt; package! Once you have done that, you will be able to configure your PDA protection here.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MultiauthGeneralConfig</name>
     <message>
         <source>When to lock Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on Opie start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on Opie resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Multiple plugins authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Required successes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Don&apos;t protect this config screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show explanatory screens</source>
         <translation type="unfinished"></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>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You must save your current settings before trying to authenticate. Press OK to accept and launch a simulated authentication process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you don&apos;t like the result of this test, don&apos;t forget to change your settings before you exit the configuration application!</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>
     </message>
     <message>
         <source>Select a net-range or enter a new one.  
 
 This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
 
 For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
 
 The entry &quot;All&quot; will allow *any* IP to connect. 
 The entry &quot;None&quot; will *deny* any connection.  
 
 If unsure, select &quot;Any&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the selected net range from the list
 
 If you press this button, the currently selected net range will be deleted from the list of net ranges.
 
 If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
 the list to the state it has been when you initially booted your Zaurus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button will restore the list of net ranges
 to the defaults.
 
 Beware that all manually entered net ranges will be lost!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select your sync software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Qtopia 1.7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie 1.0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IntelliSync</source>
         <translation type="unfinished"></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="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,52 +1,44 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>SnakeGame</name>
     <message>
         <source>Snake</source>
         <translation>Snake</translation>
     </message>
     <message>
         <source>New Game</source>
         <translation>Nuova Partita</translation>
     </message>
     <message>
         <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
@@ -1,406 +1,358 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tests</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error</source>
         <translation type="unfinished"></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>Questo grafico rappresenta quanta memoria di questa scheda Compact Flash è attualmente utilizzata.</translation>
     </message>
     <message>
         <source>Ha</source>
         <translation>Ha</translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation>Questo grafico rappresenta quanto spazio di questo disco rigido è attualmente utilizzato.</translation>
     </message>
     <message>
         <source>SD</source>
         <translation>SD</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation>Questo grafico rappresenta quanta memoria di questa scheda Secure Digital è attualmente utilizzata.</translation>
     </message>
     <message>
         <source>SC</source>
         <translation>SC</translation>
     </message>
     <message>
         <source>In</source>
         <translation>In</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation>Questo grafico rappresenta quanta memoria interna (es. memoria Flash) è attualmente utilizzata su questo dispositivo portatile.</translation>
     </message>
     <message>
         <source>RA</source>
         <translation>RA</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation>Questo grafico rappresenta quanta memoria del disco RAM è attualmente utilizzata.</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Utilizzo CPU applicazione (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>Utilizzo CPU sistema (%)</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Tipo: </translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Questa pagina mostra quanto è utilizzato il processore di questo dispositivo.</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Usata (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Buffer (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Cached (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Libera (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Memoria Totale: %1 kB</translation>
     </message>
     <message>
-        <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
-Memory is categorized as follows:
-
-1. Used - memory used to by Opie and any running applications.
-2. Buffers - temporary storage used to improve performance
-3. Cached - information that has recently been used, but has not been freed yet.
-4. Free - memory not currently used by Opie or any running applications.</source>
-        <translation type="obsolete">Questa pagina mostra quanta memoria (es. RAM) è stata allocata su questo dispositivo portatile.
-La memoria è divisa come segue:
-
-1. Usata - memoria utilizzata da Opie e da qualunque altra applicazione in esecuzione.
-2. Buffer - spazio temporaneo utilizzato per aumentare le prestazioni
-3. Cached - informazioni che sono state utilizzate recentemente, ma che non sono ancora state liberate.
-4. Libera - memoria non ancora utilizzata da Opie o da qualunque altra applicazione.</translation>
-    </message>
-    <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Modulo</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Dimensione</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Usa#</translation>
     </message>
     <message>
-        <source>Used By</source>
-        <translation type="obsolete">Usato Da</translation>
-    </message>
-    <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>Questa è una lista di tutti i moduli del kernel attualmente caricati su questo dispositivo portatile.
 
 Tenere premuto sul nome di un modulo per vedere ulteriori informazioni, o per scaricarlo.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Selezionare qui un comando e premere il pulsante Invia sulla destra per inviare il comando al modulo sopra evidenziato.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Invia</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Premere qui per inviare il comando selezionato al modulo sopra evidenziato.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Quest&apos;area mostra informazioni dettagliate su questo modulo.</translation>
     </message>
     <message>
-        <source>You really want to execute
-</source>
-        <translation type="obsolete">Vuoi veramente eseguire
-</translation>
-    </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>
         <source>Used (%1 kB)</source>
         <translation>Usata (%1 kB)</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>Disponibile (%1 kB)</translation>
     </message>
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Comando</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Stato</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Tempo</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation>Questo è l&apos;elenco di tutti i processi su questo dispositivo portatile.
 
 Tenere premuto sul nome di un processo per vedere ulteriori informazioni, o per inviargli un segnale.</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation>Selezionare qui un segnale e premere il pulsante Invia sulla destra per inviarlo al processo.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Invia</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation>Premere qui per inviare il segnale selezionato a questo processo.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>Quest&apos;area mostra informazioni dettagliate su questo processo.</translation>
     </message>
     <message>
-        <source>You really want to send
-</source>
-        <translation type="obsolete">Vuoi veramente inviare
-</translation>
-    </message>
-    <message>
-        <source>You really want to send %1 to this process?</source>
-        <translation type="obsolete">Inviare veramente %1 a questo processo?</translation>
-    </message>
-    <message>
         <source>Really want to send %1
 to this process?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>Info Sistema</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Memoria</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Storage</translation>
     </message>
     <message>
         <source>CPU</source>
         <translation>CPU</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Processi</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>Moduli</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Versione</translation>
     </message>
     <message>
         <source>Benchmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syslog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Kernel Linux&lt;/b&gt;&lt;p&gt;Versione: </translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Compilato da: </translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Versione: </translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Compilato il: </translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>&lt;p&gt;Versione: </translation>
     </message>
     <message>
-        <source>&lt;p&gt;Model: </source>
-        <translation 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>
         <source>Built against Qt/E </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,70 +1,59 @@
 <!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>
     <message>
         <source>TableViewer - Edit Keys</source>
         <translation>TableViewer - Modifica Chiavi</translation>
     </message>
     <message>
         <source>Key Name</source>
         <translation>Nome Chiave</translation>
     </message>
     <message>
         <source>Key Type</source>
         <translation>Tipo Chiave</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuovo</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Cancella</translation>
     </message>
     <message>
         <source>Clear All</source>
         <translation>Cancella Tutto</translation>
     </message>
 </context>
 <context>
     <name>TVListView</name>
     <message>
         <source>List View</source>
         <translation>Mostra Lista</translation>
     </message>
 </context>
 <context>
     <name>TableViewerWindow</name>
     <message>
         <source>Table Viewer</source>
         <translation>Visualizza Tabella</translation>
     </message>
     <message>
         <source>could not load Document</source>
         <translation>impossibile caricare Documento</translation>
     </message>
 </context>
 </TS>
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
@@ -1,282 +1,276 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>TextEdit</name>
     <message>
         <source>New</source>
         <translation>Nuovo</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Apri</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Salva</translation>
     </message>
     <message>
         <source>Save As</source>
         <translation>Salva Come</translation>
     </message>
     <message>
         <source>Cut</source>
         <translation>Taglia</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copia</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Incolla</translation>
     </message>
     <message>
         <source>Insert Time and Date</source>
         <translation>Inserisci Data ed Ora</translation>
     </message>
     <message>
         <source>Find...</source>
         <translation>Trova...</translation>
     </message>
     <message>
         <source>Zoom in</source>
         <translation>Zoom +</translation>
     </message>
     <message>
         <source>Zoom out</source>
         <translation>Zoom -</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
         <source>Advanced Features</source>
         <translation>Configurazione Avanzata</translation>
     </message>
     <message>
         <source>Wrap lines</source>
         <translation>A capo automatico</translation>
     </message>
     <message>
         <source>Start with new file</source>
         <translation>Inizia con un nuovo file</translation>
     </message>
     <message>
         <source>Prompt on Exit</source>
         <translation>Chiedi conferma in Uscita</translation>
     </message>
     <message>
         <source>Always open linked file</source>
         <translation>Apri sempre file linkati</translation>
     </message>
     <message>
         <source>File Permissions</source>
         <translation>Permessi File</translation>
     </message>
     <message>
         <source>File</source>
         <translation>File</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Modifica</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Mostra</translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation>Trova Successivo</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Chiudi Trova</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Cancella</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tutti</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Testo</translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation>Editor di Testi</translation>
     </message>
     <message>
         <source>.desktop File</source>
         <translation>File .desktop</translation>
     </message>
     <message>
         <source>Linked Document</source>
         <translation>Documento Linkato</translation>
     </message>
     <message>
         <source>Goto Line...</source>
         <translation>Vai alla Linea...</translation>
     </message>
     <message>
         <source>Search Bar Open</source>
         <translation>Apri Barra di Ricerca</translation>
     </message>
     <message>
         <source>Auto Save 5 min.</source>
         <translation>Salvataggio Automatico 5 min.</translation>
     </message>
     <message>
         <source>Text Editor has detected&lt;BR&gt;you selected a &lt;B&gt;.desktop&lt;/B&gt;file.&lt;BR&gt;Open&lt;B&gt;.desktop&lt;/B&gt; file or &lt;B&gt;linked&lt;/B&gt; file?</source>
         <translation>Text Editor ha rivelato&lt;BR&gt;che hai selezionato un file &lt;B&gt;.desktop&lt;/B&gt;.&lt;BR&gt;Aprire il file &lt;B&gt;.desktop&lt;/B&gt; o il file &lt;B&gt;linkato&lt;/B&gt;?</translation>
     </message>
     <message>
         <source>Text Edit</source>
         <translation>Modifica Testo</translation>
     </message>
     <message>
         <source>Write Failed</source>
         <translation>Errore in Scrittura</translation>
     </message>
     <message>
         <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>
         <source>Textedit</source>
         <translation>Textedit</translation>
     </message>
     <message>
         <source>Textedit detected
 you have unsaved changes
 Go ahead and save?
 </source>
         <translation>Sono state rivelate
 modifiche non salvate
 Procedere e salvare?</translation>
     </message>
     <message>
         <source>Don&apos;t Save</source>
         <translation>Non Salvare</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancella</translation>
     </message>
     <message>
         <source>Not enough lines</source>
         <translation>Linee insufficienti</translation>
     </message>
     <message>
         <source>%1 - Text Editor</source>
         <translation>%1 - Text Editor</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>Vuoi veramente&lt;BR&gt;&lt;B&gt;cancellare&lt;/B&gt; il file corrente
 dal disco?&lt;BR&gt;L&apos;operazione è &lt;B&gt;irreversibile!&lt;/B&gt;</translation>
     </message>
     <message>
         <source>Save Failed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>File Permissions</source>
         <translation>Permessi File</translation>
     </message>
     <message>
         <source>Set File Permissions</source>
         <translation>Modifica Permessi File</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Modifica Permessi file per:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>prprietario</translation>
     </message>
     <message>
         <source>group</source>
         <translation>gruppo</translation>
     </message>
     <message>
         <source>others</source>
         <translation>altri</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Proprietario</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Gruppo</translation>
     </message>
     <message>
         <source>read</source>
         <translation>lettura</translation>
     </message>
     <message>
         <source>write</source>
         <translation>scrittura</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>esecuzione</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Attenzione</translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation>Errore - nessun utente</translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation>Errore - nessun gruppo</translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation>Errore nell&apos;impostare il gruppo o il proprietario</translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation>Errore nell&apos;impostare i permessi</translation>
     </message>
 </context>
 </TS>
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,49 +1,42 @@
 <!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>
     </message>
     <message>
         <source>Quit</source>
         <translation>Esci</translation>
     </message>
     <message>
         <source>Click Play to start</source>
         <translation>Premere Gioca per iniziare</translation>
     </message>
     <message>
         <source>Make your move</source>
         <translation>Fai la tua mossa</translation>
     </message>
     <message>
         <source>You won!</source>
         <translation>Hai vinto!</translation>
     </message>
     <message>
         <source>Computer won!</source>
         <translation>Il Computer ha vinto!</translation>
     </message>
     <message>
         <source>It&apos;s a draw</source>
         <translation>Pareggio</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/today.ts b/i18n/it/today.ts
index caec888..4f754d1 100644
--- a/i18n/it/today.ts
+++ b/i18n/it/today.ts
@@ -1,195 +1,143 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Today</name>
     <message>
         <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>
         <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>
         <translation>Oggi</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
         <translation>Oggi by Maximilian Reiß</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>Premi qui per andare alle impostazioni</translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>Carica i plugin nell&apos;ordine:</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>Muovi Sù</translation>
     </message>
     <message>
         <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>
         <source>autostart on resume?</source>
         <translation>autostart al riavvio?</translation>
     </message>
     <message>
         <source>tiny banner</source>
         <translation>banner piccolo</translation>
     </message>
     <message>
         <source>Have small banner </source>
         <translation>Imposta banner piccolo</translation>
     </message>
     <message>
         <source> min</source>
         <translation> min</translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
         <translation>Quanti minuti il PDA deve rimanere spento prima che entri in funzione la funzione autostart al riavvio</translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation>minuti inattivi</translation>
     </message>
     <message>
         <source> pixel</source>
         <translation> pixel</translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
         <translation>Imposta la dimensione dell&apos;icona in pixel</translation>
     </message>
     <message>
         <source>icon size</source>
         <translation>dimensione icona</translation>
     </message>
     <message>
         <source> sec</source>
         <translation> sec</translation>
     </message>
     <message>
         <source>never</source>
         <translation>mai</translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
         <translation>Quanto spesso Oggi deve aggiornarsi</translation>
     </message>
     <message>
         <source>refresh</source>
         <translation>aggiorna</translation>
     </message>
 </context>
 </TS>
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
@@ -1,648 +1,564 @@
 <!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 %1&lt;/h1&gt;&lt;br&gt;</source>
         <translation>&lt;h1&gt;Allarme alle %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">Vuota</translation>
     </message>
 </context>
 <context>
     <name>NewTaskDlg</name>
     <message>
         <source>New Task</source>
         <translation type="unfinished">Nuova Attività</translation>
     </message>
     <message>
         <source>Blank task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Using template:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Task Editor</source>
         <translation>Editor Attività</translation>
     </message>
     <message>
         <source>Information</source>
         <translation>Informazioni</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Stato</translation>
     </message>
     <message>
         <source>Alarms</source>
         <translation>Allarmi</translation>
     </message>
     <message>
         <source>Recurrence</source>
         <translation>Ricorrenze</translation>
     </message>
 </context>
 <context>
     <name>Opie</name>
     <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.
 
 Uscire comunque?</translation>
     </message>
     <message>
         <source>Todo</source>
         <translation>Attività</translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation>tutte le attività?</translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation>tutte le attività completate?</translation>
     </message>
     <message>
         <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
         <translation>&lt;P&gt;%1 nuove attività ricevute.&lt;p&gt;Vuoi aggiungerle alle tue Attività?</translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation>Nuove Attività</translation>
     </message>
     <message>
         <source>C.</source>
         <translation>C.</translation>
     </message>
     <message>
         <source>Priority</source>
         <translation>Priorità</translation>
     </message>
     <message>
-        <source>Description</source>
-        <translation 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>
         <source>Remove</source>
         <translation>Elimina</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation>Nuovo Modello %1</translation>
     </message>
     <message>
         <source>Click here to set the priority of new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Premi qui per impostare la priorità della nuova attività.
     
 Quest&apos;area è chiamata &quot;quick task bar&quot;.
 
 Ti permette di aggiungere velocemente una nuova attività.  Quest&apos;area può essere visualizzata o nascosta tramite Opzioni-&gt;&apos;Mostra quick task bar&apos; dal menù in alto.</translation>
     </message>
     <message>
         <source>Enter description of new task here.
 
 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>Inserisci qui la descrizione della nuova attività.
 
 Quest&apos;area è chiamata &quot;quick task bar&quot;.
 
 Ti permette di aggiungere velocemente una nuova attività.  Quest&apos;area può essere visualizzata o nascosta tramite Opzioni-&gt;&apos;Mostra quick task bar&apos; dal menù in alto.</translation>
     </message>
     <message>
         <source>More</source>
         <translation>Ancora</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>Premi qui per inserire altre informazioni per la nuova attività.
 
 Quest&apos;area è chiamata &quot;quick task bar&quot;.
 
 Ti permette di aggiungere velocemente una nuova attività.  Quest&apos;area può essere visualizzata o nascosta tramite Opzioni-&gt;&apos;Mostra quick task bar&apos; dal menù in alto.</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Inserisci</translation>
     </message>
     <message>
         <source>Click here to add new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Premi qui per aggiungere una nuova attività.
 
 Quest&apos;area è chiamata &quot;quick task bar&quot;.
 
 Ti permette di aggiungere velocemente una nuova attività.  Quest&apos;area può essere visualizzata o nascosta tramite Opzioni-&gt;&apos;Mostra quick task bar&apos; dal menù in alto.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Cancella</translation>
     </message>
     <message>
         <source>Click here to reset new task information.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Premi qui per cancellare le informazioni sulla nuova attività.
 
 Quest&apos;area è chiamata &quot;quick task bar&quot;.
 
 Ti permette di aggiungere velocemente una nuova attività.  Quest&apos;area può essere visualizzata o nascosta tramite Opzioni-&gt;&apos;Mostra quick task bar&apos; dal menù in alto.</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Priorità:</translation>
     </message>
     <message>
         <source>Data can not be edited, currently syncing</source>
         <translation>Dati non modificabili, sincronizzazione in corso</translation>
     </message>
     <message>
         <source>Data can&apos;t be edited, currently syncing</source>
         <translation>Dati non modificabili, sincronizzazione in corso</translation>
     </message>
     <message>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>Table View</source>
         <translation>Mostra Tabella</translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation>%1 giorno(i)</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nessuna</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Ora</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuova</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Modifica</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Elimina</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Summary:</source>
         <translation>Sommario:</translation>
     </message>
     <message>
         <source>Enter brief description of the task here.</source>
         <translation>Inserisci qui una breve descrizione dell&apos;attività.</translation>
     </message>
     <message>
         <source>Complete </source>
         <translation>Completare </translation>
     </message>
     <message>
         <source>Work on </source>
         <translation>Lavorare su </translation>
     </message>
     <message>
         <source>Buy </source>
         <translation>Comprare </translation>
     </message>
     <message>
         <source>Organize </source>
         <translation>Organizzare </translation>
     </message>
     <message>
         <source>Get </source>
         <translation>Prendere </translation>
     </message>
     <message>
         <source>Update </source>
         <translation>Aggiornare </translation>
     </message>
     <message>
         <source>Create </source>
         <translation>Creare </translation>
     </message>
     <message>
         <source>Plan </source>
         <translation>Pianificare </translation>
     </message>
     <message>
         <source>Call </source>
         <translation>Chiamare </translation>
     </message>
     <message>
         <source>Mail </source>
         <translation>Inviare per posta </translation>
     </message>
     <message>
         <source>Select priority of task here.</source>
         <translation>Seleziona qui la priorità dell&apos;attivita.</translation>
     </message>
     <message>
         <source>Very High</source>
         <translation>Molto Alta</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Alta</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normale</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Bassa</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>Molto Bassa</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoria:</translation>
     </message>
     <message>
         <source>Select category to organize this task with.</source>
         <translation>Seleziona la categoria in cui deve essere inserita quest&apos;attività.</translation>
     </message>
     <message>
         <source>Recurring task</source>
         <translation>Attività ricorrente</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>Premi qui se l&apos;attività è eseguita in modo ricorrente. Se selezionato, la frequenza può essere impostata nel tab Ricorrenza.</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Descrizione:</translation>
     </message>
     <message>
         <source>Enter any additional information about this task here.</source>
         <translation>Inserisci qui ogni altra informazione aggiuntiva per questa attività.</translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation>Attività</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorStatus</name>
     <message>
         <source>Status:</source>
         <translation>Stato:</translation>
     </message>
     <message>
         <source>Click here to set the current status of this task.</source>
         <translation>Premi qui per inserire lo stato di questa attività.</translation>
     </message>
     <message>
         <source>Started</source>
         <translation>Iniziata</translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation>Rinviata</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>Terminata</translation>
     </message>
     <message>
         <source>Not started</source>
         <translation>Non iniziata</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Avanzamento:</translation>
     </message>
     <message>
         <source>Select progress made on this task here.</source>
         <translation>Seleziona qui lo stato di avanzamento per questa attività.</translation>
     </message>
     <message>
         <source>0 %</source>
         <translation>0 %</translation>
     </message>
     <message>
         <source>20 %</source>
         <translation>20 %</translation>
     </message>
     <message>
         <source>40 %</source>
         <translation>40 %</translation>
     </message>
     <message>
         <source>60 %</source>
         <translation>60 %</translation>
     </message>
     <message>
         <source>80 %</source>
         <translation>80 %</translation>
     </message>
     <message>
         <source>100 %</source>
         <translation>100 %</translation>
     </message>
     <message>
         <source>Start Date:</source>
         <translation>Data Inizio:</translation>
     </message>
     <message>
         <source>Click here to set the date this task was started.</source>
         <translation>Premi qui per inserire la data in cui l&apos;attività è iniziata.</translation>
     </message>
     <message>
         <source>Due Date:</source>
         <translation>Data Fine:</translation>
     </message>
     <message>
         <source>Click here to set the date this task needs to be completed by.</source>
         <translation>Premi qui per inserire la data entro cui l&apos;attività deve essere completata.</translation>
     </message>
     <message>
         <source>Completed:</source>
         <translation>Completata:</translation>
     </message>
     <message>
         <source>Click here to mark this task as completed.</source>
         <translation>Premi qui per contrassegnare l&apos;attività come completata.</translation>
     </message>
     <message>
         <source>Click here to set the date this task was completed.</source>
         <translation>Premi qui per inserire la data in cui quest&apos;attività è stata completata.</translation>
     </message>
     <message>
         <source>Maintainer Mode:</source>
         <translation>Modalità Responsabile:</translation>
     </message>
     <message>
         <source>Click here to set the maintainer&apos;s role.</source>
         <translation>Premi qui per inserire la funzione del responsabile.</translation>
     </message>
     <message>
         <source>Nothing</source>
         <translation>Nessuna</translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation>Responsabile</translation>
     </message>
     <message>
         <source>Done By</source>
         <translation>Eseguito Da</translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation>Coordinato</translation>
     </message>
     <message>
         <source>Maintainer:</source>
         <translation>Responsabile:</translation>
     </message>
     <message>
         <source>This is the name of the current task maintainer.</source>
         <translation>Questo è il nome del responsabile dell&apos;attività corrente.</translation>
     </message>
     <message>
         <source>test</source>
         <translation>test</translation>
     </message>
     <message>
         <source>Click here to select the task maintainer.</source>
         <translation>Premi qui per selezionare il responsabile dell&apos;attività.</translation>
     </message>
 </context>
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
@@ -1,36 +1,32 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>GroupDialog</name>
     <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>
         <translation>Modifica Utente</translation>
     </message>
 </context>
 </TS>
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,832 +1,566 @@
 <!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>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <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>
         <source>&amp;Import text file</source>
         <translation>Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
         <translation>Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
         <translation>&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation 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>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation 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>
         <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
         <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
         <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
         <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
         <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
         <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
         <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
         <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
         <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
         <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
         <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
         <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
         <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
         <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
         <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
         <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
-        <source>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>
         <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No document defined.
 You have to create a new document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to save </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 before continuing?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Now you have to enter
 a password twice for your
 newly created document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&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>
         <source>&lt;P&gt;You must create a new document first. Ok to create?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Password Manager&lt;br&gt;ZSafe version 2.1.2&lt;br&gt;&lt;/b&gt;by Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Translations by Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,723 +1,731 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Continue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error!</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>This is an all day event.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this occurence</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00 PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Views</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
+    <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>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstEvent</name>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Start Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Silent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>nd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>rd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>th</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</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,71 +1,68 @@
 <!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>
     </message>
     <message>
         <source>Stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
         <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>
     </message>
 </context>
 </TS>
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
@@ -1,300 +1,328 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BaseSetup</name>
     <message>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slideshow timeout:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Toggle autoscale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to next image</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Delete Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Image Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></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>Browser Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Keyboard Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie Eye - Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Imageinfo Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Imageview Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Go dir up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start slideshow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and Imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show images fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto rotate images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show images unscaled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show zoomer window when unscaled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
     <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>
         <source>&lt;center&gt;&lt;b&gt;Be carefull with the following options!&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show files recursive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recursion depth:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Digital Camera View</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Name Only</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>imageinfo</name>
     <message>
         <source>View Full Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays an thumbnail of the image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays info of selected image</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,817 +1,878 @@
 <!DOCTYPE TS><TS>
 <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>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerUI</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposeMail</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please create an SMTP account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a File.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Store message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Store message into drafts?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Attachments will not be stored in &quot;Draft&quot; folder&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Receiver specified</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposeMailUI</name>
     <message>
         <source>Compose Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>send later</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>use:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BCC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <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>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>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete the selected Account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select an account.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccountsUI</name>
     <message>
         <source>Configure Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>News</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IMAPconfigUI</name>
     <message>
         <source>Configure IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefix</source>
         <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>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>
     </message>
     <message>
         <source>Send queued mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show/Hide folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Newsgroups</source>
         <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>
     </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>
 <context>
     <name>NNTPconfigUI</name>
     <message>
         <source>Configure NNTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Newsgroup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get newsgroup list from server</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Newmdirdlgui</name>
     <message>
         <source>Enter directory name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directory name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directory contains other subdirs</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <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>
     </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>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></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>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec imapd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>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>
     </message>
     <message>
         <source>Use Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the SMTP Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port of the SMTP Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SelectMailTypeUI</name>
     <message>
         <source>Select Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Account Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>POP3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SMTP</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SettingsDialogUI</name>
     <message>
         <source>Settings Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View mail as Html</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compose Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mails later ( enqueue in outbox )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></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>
     </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>
     </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>
     </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>
     </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>
     </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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Store mail(s) to&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Folder:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create new folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefix will prepend, no need to enter it!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move mail(s)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,832 +1,566 @@
 <!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>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <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>
         <source>&amp;Import text file</source>
         <translation>Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
         <translation>Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
         <translation>&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation 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>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation 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>
         <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
         <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
         <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
         <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
         <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
         <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
         <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
         <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
         <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
         <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
         <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
         <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
         <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
         <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
         <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
         <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
-        <source>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>
         <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No document defined.
 You have to create a new document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to save </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 before continuing?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Now you have to enter
 a password twice for your
 newly created document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&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>
         <source>&lt;P&gt;You must create a new document first. Ok to create?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Password Manager&lt;br&gt;ZSafe version 2.1.2&lt;br&gt;&lt;/b&gt;by Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Translations by Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,723 +1,731 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Continue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error!</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>This is an all day event.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this occurence</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00 PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Views</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
+    <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>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstEvent</name>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Start Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Silent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>nd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>rd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>th</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</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,71 +1,68 @@
 <!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>
     </message>
     <message>
         <source>Stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
         <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>
     </message>
 </context>
 </TS>
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
@@ -1,300 +1,328 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BaseSetup</name>
     <message>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slideshow timeout:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Toggle autoscale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to next image</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Delete Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Image Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></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>Browser Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Keyboard Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie Eye - Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Imageinfo Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Imageview Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Go dir up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start slideshow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and Imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show images fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto rotate images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show images unscaled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show zoomer window when unscaled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
     <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>
         <source>&lt;center&gt;&lt;b&gt;Be carefull with the following options!&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show files recursive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recursion depth:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Digital Camera View</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Name Only</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>imageinfo</name>
     <message>
         <source>View Full Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays an thumbnail of the image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays info of selected image</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,817 +1,878 @@
 <!DOCTYPE TS><TS>
 <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>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerUI</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposeMail</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please create an SMTP account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a File.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Store message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Store message into drafts?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Attachments will not be stored in &quot;Draft&quot; folder&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Receiver specified</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposeMailUI</name>
     <message>
         <source>Compose Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>send later</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>use:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BCC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <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>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>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete the selected Account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select an account.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccountsUI</name>
     <message>
         <source>Configure Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>News</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IMAPconfigUI</name>
     <message>
         <source>Configure IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefix</source>
         <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>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>
     </message>
     <message>
         <source>Send queued mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show/Hide folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Newsgroups</source>
         <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>
     </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>
 <context>
     <name>NNTPconfigUI</name>
     <message>
         <source>Configure NNTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Newsgroup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get newsgroup list from server</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Newmdirdlgui</name>
     <message>
         <source>Enter directory name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directory name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directory contains other subdirs</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <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>
     </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>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></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>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec imapd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>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>
     </message>
     <message>
         <source>Use Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the SMTP Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port of the SMTP Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SelectMailTypeUI</name>
     <message>
         <source>Select Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Account Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>POP3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SMTP</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SettingsDialogUI</name>
     <message>
         <source>Settings Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View mail as Html</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compose Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mails later ( enqueue in outbox )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></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>
     </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>
     </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>
     </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>
     </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>
     </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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Store mail(s) to&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Folder:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create new folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefix will prepend, no need to enter it!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move mail(s)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,832 +1,566 @@
 <!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>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <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>
         <source>&amp;Import text file</source>
         <translation>Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
         <translation>Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
         <translation>&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation 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>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation 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>
         <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
         <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
         <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
         <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
         <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
         <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
         <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
         <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
         <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
         <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
         <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
         <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
         <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
         <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
         <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
         <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
-        <source>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>
         <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No document defined.
 You have to create a new document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to save </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 before continuing?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Now you have to enter
 a password twice for your
 newly created document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&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>
         <source>&lt;P&gt;You must create a new document first. Ok to create?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Password Manager&lt;br&gt;ZSafe version 2.1.2&lt;br&gt;&lt;/b&gt;by Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Translations by Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,576 +1,496 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation>Pilns Vārds</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Kontaktinformācija</translation>
     </message>
     <message>
         <source>Pick</source>
         <translation>Izvēlēties</translation>
     </message>
 </context>
 <context>
     <name>AbView</name>
     <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>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation>Iezīmētais fails
 nebeidzas ar &quot;.vcf&quot;.
 Vai tiešām vēlaties to atvērt?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Jā</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;Nē</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>Pievienot Kontaktu?</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <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>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Nevaru saglabāt informāciju.
 Atbrīvojat nedaudz vietas
 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>
         <translation>Klikšķiniet uz tab lai kādu izvēlētos</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Dažādi</translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation>Meklēšanas Uzstādījumi</translation>
     </message>
     <message>
         <source>Query Style</source>
         <translation>Pieprasījuma Stils</translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation>Uzstādījumi meklēšanas pieprasījuma stilam</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>Lietot Regulāras Izteiksmes</translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation>Meklēšana sagaida regulāras izteiksmes</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>Lietojiet Noklusētos (*,?)</translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
         <translation>Meklēšana sagaida vienkāršus noklusējumus</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Reģistrjūtīgs</translation>
     </message>
     <message>
         <source>If selected, search differs between upper and lower chars</source>
         <translation>Ja atzīmēts, meklēšana atšķir lielos un mazos burtus</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Fonts</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Mazs</translation>
     </message>
     <message>
         <source>Font size for list- and card view</source>
         <translation>Fonta izmērs saraksta un kartes skatam</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normāls</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Liels</translation>
     </message>
     <message>
         <source>Tool-/Menubar</source>
         <translation>Instrumenti-/Izvēlne</translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation>Fiksēts</translation>
     </message>
     <message>
         <source>Switch to fixed menu-/toolbars after restarting application !</source>
         <translation>Pārslēgties uz fiksētu izvēļņu/instrumentjoslu pēc aplikācijas pārstartēšanas !</translation>
     </message>
     <message>
         <source>Moveable</source>
         <translation>Pārvietojams</translation>
     </message>
     <message>
         <source>Switch to moveable menu-/toolbars after restarting application !</source>
         <translation>Pārslēgties uz pārvietojamām izvēlnēm-/komandpogām pēc aplikācijas pārstartēšanas !</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Pasts</translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
         <translation>Fontu iestatījumi kartes un saraksta skatam</translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation>Labāk QT-Pasts</translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation>Lietot Sharp e-pasta aplikāciju ja tā ir pieejama</translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation>Izvēlēties Opie-Pasts</translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</source>
         <translation>Lietot OPIE pastu ja tas ir instalēts</translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation>Piezīme: QT-Pasts ir pieejams
 tikai SHARP noklusētajā
 ROM.  Opie-Pasts
 ir par brīvu !</translation>
     </message>
     <message>
         <source>Order</source>
         <translation>Kārtība</translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation>Attēlošanas Kārtība:</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Augšup</translation>
     </message>
     <message>
         <source>Move selected attribute one line up</source>
         <translation>Pārvietot iezīmēto atribūtu rindu uz augšu</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Lejup</translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation>Pārvietot iezīmēto atribūtu vienu rindu uz leju</translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation>Uzrādīt visus pieejamos atribūtus</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Pievienot</translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation>Pievienot atzīmēto atribūtu no saraksta zem augšējā saraksta</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Izņemt</translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation>Izņemt iezīmēto atribūtu no augšējā saraksta</translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation>Kārtība (augša -&gt; Leja) definē primāro kontaktu kas jārāda saraksta skata nākamajā kolonā</translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Full Name...</source>
         <translation>Pilns Vārds...</translation>
     </message>
     <message>
         <source>Press to enter last- middle and firstname</source>
         <translation>Nospiediet lai ievadītu vārdu uzvārdu</translation>
     </message>
     <message>
         <source>Enter fullname directly ! If you have a lastname with multiple words ( for instance &quot;de la Guerra&quot;), please write &lt;lastname&gt;,&lt;firstnames&gt; like this: &quot;de la Guerra, Carlos Pedro&quot;</source>
         <translation>Ievadiet pilnu vārdu uzvārddu ! Ja jums ir uzvārds no vairākiem vārdiem ( piemēram &quot;de la Guerra&quot;), lūdzu rakstiet &lt;uzvārds&gt;,&lt;vārds&gt; šādi: &quot;de la Guerra, Carlos Pedro&quot;</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Amats</translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation>Darba veta..</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Sufikss</translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation>Kaut kas līdzīgs &quot;jr.&quot;..</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Orgainzācija</translation>
     </message>
     <message>
         <source>The working place of the contact</source>
         <translation>Kontakta darba vieta</translation>
     </message>
     <message>
         <source>Press to select attribute to change</source>
         <translation>Nospiežat lai atzīmētu maināmo atribūtu</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Saglabāt Kā</translation>
     </message>
     <message>
         <source>Press to select how to store the name (and howto show it in the listview)</source>
         <translation>Nospiežat lai izvēlētos kā saglabāt vārdu (un kā to rādīt sarakstā)</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategorija</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Piezīmes...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Pamata</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Bizness</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Mājas</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Adrese</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Pilsēta</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Štats/Rajons</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>Indekss</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>Valsts</translation>
     </message>
     <message>
         <source>United States</source>
         <translation></translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation></translation>
     </message>
     <message>
         <source>Afghanistan</source>
         <translation></translation>
     </message>
     <message>
         <source>Albania</source>
         <translation></translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation></translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation></translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation></translation>
     </message>
     <message>
         <source>Angola</source>
         <translation></translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation></translation>
     </message>
     <message>
         <source>Antarctica</source>
         <translation></translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation></translation>
     </message>
     <message>
         <source>Armenia</source>
         <translation></translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation></translation>
     </message>
     <message>
         <source>Australia</source>
         <translation></translation>
     </message>
     <message>
         <source>Austria</source>
         <translation></translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation></translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation></translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation></translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation></translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation></translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation></translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation></translation>
     </message>
     <message>
         <source>Belize</source>
         <translation></translation>
     </message>
     <message>
         <source>Benin</source>
         <translation></translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation></translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation></translation>
     </message>
     <message>
         <source>Bolivia</source>
         <translation></translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation></translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation></translation>
     </message>
     <message>
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
@@ -1,450 +1,361 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AdvancedFm</name>
     <message>
         <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>
         <source>Open as text</source>
         <translation>Atvērt kā tekstu</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Darbības</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>Veidot Direktoriju</translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation>Veidot Simsaiti</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Pārsaukt</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Kopēt</translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation>Kopēt Kā</translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation>Kopēt Tajā Pašā Dir</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>Pārvietot</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Dzēst</translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation>Pievienot Komentāriem</translation>
     </message>
     <message>
         <source>Run Command</source>
         <translation>Palaist Komandu</translation>
     </message>
     <message>
         <source>File Info</source>
         <translation>Faila Info</translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation>Uzstādīt Tiesības</translation>
     </message>
     <message>
         <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>
         <source>Run Command with Output</source>
         <translation>Palaist Komandu ar Izvadu</translation>
     </message>
     <message>
         <source>Select All</source>
         <translation>Atzīmēt Visu</translation>
     </message>
     <message>
         <source>Switch to View 1</source>
         <translation>Pārslēgt uz Skatu 1</translation>
     </message>
     <message>
         <source>Switch to View 2</source>
         <translation>Pārslēgt uz Skatu 2</translation>
     </message>
     <message>
         <source>Bookmark Directory</source>
         <translation>Iezīmēt Direktoriju</translation>
     </message>
     <message>
         <source>Remove Current Directory from Bookmarks</source>
         <translation>Izdzēst Tekošo Direktoriju no Grāmatzīmēm</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Izmērs</translation>
     </message>
     <message>
         <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>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Kļūda</translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>Nevaru pārsaukt</translation>
     </message>
     <message>
         <source>Not Yet Implemented</source>
         <translation>Nav Vēl Implementēts</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 does not exist&lt;/p&gt;</source>
         <translation>&lt;p&gt;%1 neeksistē&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;Uzlabotais FailuMenedžeris 2002-2003 visas tiesības rezervētas no L.J.Potter un licenzēts ar GPL licensi&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;Nevaru izņemt tekošo direktoriju no grāmatzīmēm. Tā nav grāmatzīmēs!&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Refresh</source>
         <translation>Atjaunot</translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1 files?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Vai tiešām dzēst %1 failus?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1 and all it&apos;s contents?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Tiešām dzēst %1 un visu tā saturu?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Tiešām dzēst %1?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Really copy %1 files?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Tiešām kopēt %1 failus?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 already  exists. Ok to overwrite?&lt;/P&gt;</source>
         <translation>&lt;p&gt;%1 jau eksistē.  Pārrakstīt?&lt;/P&gt;</translation>
     </message>
     <message>
         <source>&lt;P&gt;Could not copy %1 to %2&lt;/P&gt;</source>
         <translation>&lt;P&gt;Nevaru nokopēt %1 uz %2&lt;/P&gt;</translation>
     </message>
     <message>
         <source>Copy %1 As</source>
         <translation>Kopēt %1 Kā</translation>
     </message>
     <message>
         <source>&lt;P&gt; %1 already exists. Ok to overwrite?&lt;/p&gt;</source>
         <translation>&lt;P&gt; %1 jau eksistē. Vai pārrakstīt?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not copy %1 to %2&lt;/P&gt;</source>
         <translation>&lt;p&gt;Nevaru kopēt %1 uz %2&lt;/P&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt; %1 already exists. Do you really want to delete it?&lt;/P&gt;</source>
         <translation>&lt;p&gt; %1 jau eksistē. Vai tiešām vēlaties to pārrakstīt?&lt;/P&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not move %1&lt;/p&gt;</source>
         <translation>&lt;p&gt;Nevaru pārvietot %1&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not copy %1 to %2&lt;/p&gt;</source>
         <translation>&lt;p&gt;Nevaru kopēt %1 uz %2&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Output</source>
         <translation>Izvads</translation>
     </message>
     <message>
         <source>Process could not start</source>
         <translation>Procesu nevar palaist</translation>
     </message>
     <message>
         <source>Error
 </source>
         <translation>Kļūda
 </translation>
     </message>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Saglabāt izvadu failā (tikai vārds)</translation>
     </message>
     <message>
         <source>
 Finished
 </source>
         <translation>
 Pabeigts
 </translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>filePermissions</source>
         <translation>failuTiesības</translation>
     </message>
     <message>
         <source>Set File Permissions</source>
         <translation>Uzstādīt Faila Tiesības</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Uzstādīt tiesības:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>īpašnieks</translation>
     </message>
     <message>
         <source>group</source>
         <translation>grupa</translation>
     </message>
     <message>
         <source>others</source>
         <translation>citi</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Īpašnieks</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Grupa</translation>
     </message>
     <message>
         <source>read</source>
         <translation>lasīt</translation>
     </message>
     <message>
         <source>write</source>
         <translation>rakstīt</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>palaist</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Brīdinājums</translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation>Kļūda- nav lietotāja</translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation>Kļūda- nav grupas</translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation>Kļūda uzstādot īpašumtiesības vai grupu</translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation>Kļūda uzstādot režīmu</translation>
     </message>
 </context>
 </TS>
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
@@ -1,277 +1,233 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Appearance</name>
     <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>Stili kontrolē veidu kā tādi elementi kā izskatās pogas un ruļu joslas aplikācijā.
 
 Klikšķiniet šeit lai izvēlētos pieejamos stilus.</translation>
     </message>
     <message>
         <source>Settings...</source>
         <translation>Uzstādījumi...</translation>
     </message>
     <message>
         <source>Click here to configure the currently selected style.
 
 Note:  This option is not available for all styles.</source>
         <translation>Klikšķiniet šeit lai konfigurētu iezīmēto stilu.
 
 Piezīme: Šī opcija nav pieejama visiem stiliem.</translation>
     </message>
     <message>
         <source>Window decorations control the way the application title bar and its buttons appear.
 
 Click here to select an available decoration.</source>
         <translation>Logu dekorācijas kontrolē veidu kā attēlosies loga virsraksts un pogas.
 
 Klikšķiniet šeit lai atzīmētu pieejamās dekorācijas.</translation>
     </message>
     <message>
         <source>Select the desired name, style and size of the default font applications will use.</source>
         <translation>Izvēlaties aplikācijām lietojamo noklusēto fontu nosaukumu, stilu un izmēru.</translation>
     </message>
     <message>
         <source>Color schemes are a collection of colors which are used for various parts of the display.
 
 Click here to select an available scheme.</source>
         <translation>Krāsu shēmas ir krāsu kolekcijas kuras tiek pielietotas dažādās ekrāna daļās.
 
 Klikšķiniet šeit lai izvēlētos pieejamo shēmu.</translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation>Tekošā shēma</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>Labot...</translation>
     </message>
     <message>
         <source>Click here to change the colors in the current color scheme.</source>
         <translation>Klikšķiniet šeit lai mainītu tekošās krāsu shēmas krāsas.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Dzēst</translation>
     </message>
     <message>
         <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:
 
 1. Tabi - normāli tabi tiakai ar tekstu
 2. Tabi ar ikonām - tabi ar ikonu katram, teksta virsraksts parādās tika tekošajam
 3. Saraksts - tabu vertikāls saraksts
 4. Saraksts ar ikonām - vertikālais saraksts ar tabiem ar ikonām</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Tabi</translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
         <translation>Tabi ar ikonām</translation>
     </message>
     <message>
         <source>Drop down list</source>
         <translation>Saraksts</translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation>Saraksts ar ikonām</translation>
     </message>
     <message>
         <source>Top</source>
         <translation>Augša</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation>Klikšķiniet šeit, lai tabi parādītos loga augšpusē.</translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation>Apakšā</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation>Klikšķiniet šeit, lai tabi parādītos loga apakšā.</translation>
     </message>
     <message>
         <source>Rotation direction:</source>
         <translation>Griešanas virziens:</translation>
     </message>
     <message>
         <source>Appearance Settings</source>
         <translation>Izskata Uzstādījumi</translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation>Šis ir pirmsapskates logs.  Skatieties šeit lai redzētu kā jūsu uzstādījumi izmaina izskatu.</translation>
     </message>
     <message>
         <source>Style</source>
         <translation>Stils</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Fonts</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Krāsas</translation>
     </message>
     <message>
         <source>Windows</source>
         <translation>Logi</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Uzlabotais</translation>
     </message>
     <message>
         <source>Save Scheme</source>
         <translation>Saglabāt Shēmu</translation>
     </message>
     <message>
         <source>Save scheme</source>
         <translation>Saglabāt shēmu</translation>
     </message>
     <message>
         <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>
         <translation>Labot shēmu</translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation>Klikšķiniet šeit lai izvēlētos krāsu priekš:</translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
         <translation>Piemērs</translation>
     </message>
     <message>
         <source>Normal Item</source>
         <translation>Normāls Elements</translation>
     </message>
     <message>
         <source>Disabled Item</source>
         <translation>Noliegts Elements</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Izvēlne</translation>
     </message>
     <message>
         <source>Normal Text</source>
         <translation>Normāls Teksts</translation>
     </message>
     <message>
         <source>Highlighted Text</source>
         <translation>Iezīmēts Teksts</translation>
     </message>
     <message>
         <source>Button</source>
         <translation>Poga</translation>
     </message>
     <message>
         <source>Check Box</source>
         <translation>Izvēles Rūtiņa</translation>
     </message>
     <message>
         <source>Sample window using the selected settings.</source>
         <translation>Piemēra logs lietojot atzīmētos uzstādījumus.</translation>
     </message>
 </context>
 </TS>
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
@@ -1,623 +1,591 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation>Kategoriju Filtrs</translation>
     </message>
     <message>
         <source>Select one or more groups</source>
         <translation>Izvēlēties vienu vai vairāk grupas</translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation>Lasa konfigurāciju...</translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Atlikt</translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Remove
 </source>
         <translation>Izņemt
 </translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation>Instalēt
 </translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation>Uzlabot</translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation>(Pārinstalēt)</translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation>(Uzlabot)</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation>Mērķis</translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation>Pieejamā Vieta</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Izvads</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Starts</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opcijas</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Visas</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Teksts</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation>Pārtraukt</translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation>**** Lietotājs klikšķināja PĀRTRAUKT ****</translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation>**** Process Pārtraukts ****</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Aizvērt</translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation>%1 Kb</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Nezināms</translation>
     </message>
     <message>
         <source>Save output</source>
         <translation>Saglabāt izvadu</translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation>Opcijas</translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation>Piespiedu Atkarības</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation>Piespiedu Pārinstalācija</translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation>Piespiedu Izņemšana</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation>Piespiedu Pārrakstīšana</translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation>Informācijas Līmenis</translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation>Tikai kļūdas</translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation>Normālas ziņas</translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation>Informatīvās ziņas</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation>Problēmu izvads</translation>
     </message>
 </context>
 <context>
     <name>Ipkg</name>
     <message>
         <source>Dealing with package %1</source>
         <translation>Darbojos ar paku %1</translation>
     </message>
     <message>
         <source>Removing symbolic links...
 </source>
         <translation>Izņemu simboliskās saites...
 </translation>
     </message>
     <message>
         <source>Creating symbolic links for %1.</source>
         <translation>Veidoju simboliskās saites priekš %1.</translation>
     </message>
     <message>
         <source>Creating symbolic links for %1</source>
         <translation>Veidoju simboliskās saites priekš %1</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>Pabeigts</translation>
     </message>
     <message>
         <source>Removing status entry...</source>
         <translation>Izņemu statusa ierakstu...</translation>
     </message>
     <message>
         <source>status file - </source>
         <translation>statusa fails -</translation>
     </message>
     <message>
         <source>package - </source>
         <translation>paka -</translation>
     </message>
     <message>
         <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>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation>AQPkg - Paku Menedžeris</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation>Šeit rakstiet tekstu meklēšanai.</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation>Klikšķiniet šeit lai paslēptu Ātrās Pārvietošanās instrumentjoslu.</translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation>Atjaunot sarakstus</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation>Klikšķiniet šeit, lai no serveriem atjauninātu paku sarakstus.</translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation>Atjaunināt</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation>Klikšķiniet šeit lai atjauninātu instalētās pakas ja ir pieejama jaunāka versija.</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Lejuplādēt</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation>Klikšķiniet šeit lai lejuplādētu iezīmēto paku(as).</translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation>Uzlikt izmaiņas</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation>Klikšķiniet šeit lai instalētu, izņemtu vai atjauninātu iezīmēto paku(as).</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Konfigurēt</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation>Klikšķiniet šeit lai konfigurētušo aplikāciju.</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Darbības</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation>Rādīt pakas kuras nav instalētas</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation>Klikšķiniet šeit lai rādītu pakas kuras ir pieejamas bet vēl nav instalētas.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation>Rādīt instalētās pakas</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation>Klikšķiniet šeit lai rādītu pakas kuras ir instalētas.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation>Rādīt atjauninātās pakas</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation>Klikšķiniet šeit lai rādītu pakas kuras ir instalētas un kurām ir pieejama jaunāka versija.</translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation>Filtrēt pēc kategorijas</translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation>Klikšķiniet šeit lai uzrādītu pakas kuras pieder vienai kategorijai.</translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation>Uzstādīt kategorijas filtru</translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation>Klikšķiniet šeit, lai mainītu paku filtra kategoriju.</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Meklēt</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation>Klikšķiniet šeit lai meklētu pakas pēc nosaukuma.</translation>
     </message>
     <message>
         <source>Find next</source>
         <translation>Meklēt nākamo</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation>Klikšķiniet šeit lai meklētu nākamo paku kuras nosaukums satur norādīto tekstu.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation>Ātrās Pārvietošanāš pogas</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation>Klikšķiniet šeit lai parādītu/paslēptu taustiņus kuri ļauj ātri pārvietoties pa paku sarakstu.</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Skats</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation>Klikšķiniet šeit lai paslēptu meklēšanas instrumentu paneli.</translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation>Serveri:</translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation>Klikšķiniet šeit lai atzīmētu paku avotu.</translation>
     </message>
     <message>
         <source>Packages</source>
         <translation>Pakas</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 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>Šis ir uzrādītā servera visu paku saraksts.
 
 Zilais punkts pie pakas vārda norāda ka paka jau ir uzinstalēta
 
 Zilais punkts ar zvaigznīti norāda ka šai pakai dotajā serverī ir pieejams jauninājums.
 
 Klikšķiniet pa kreisi no pakas, lai to atzīmētu.</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Izņemt</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation>Klikšķiniet šeit lai izņemtu iezīmēto paku(as).</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation>Veidoju serveru sarakstu:
  %1</translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation>Veidoju paku sarakstu priekš:
   %1</translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
         <translation>Atjaunoju serveru paku sarakstu</translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation>UZMANĪBU: Atjaunināšana
 Opie/Qtopia darbības laikā
 NAV rekomendēta!
 
 Vai esiet pārliecināts?
 </translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Brīdinājums</translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
         <translation>Atjauninu instalētās pakas</translation>
     </message>
     <message>
         <source>Are you sure you wish to delete
 %1?</source>
         <translation>Vai esiet pārliecināti ka vēlates dzēst
 %1 ?</translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation>Esie pārliecināts?</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nē</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Jā</translation>
     </message>
     <message>
         <source>Download to where</source>
         <translation>Lejuplādēt uz</translation>
     </message>
     <message>
         <source>Enter path to download to</source>
         <translation>Norādiet ceļu kur lejuplādēt</translation>
     </message>
     <message>
         <source>Install Remote Package</source>
         <translation>Instalēt Attālināto Paku</translation>
     </message>
     <message>
         <source>Enter package location</source>
         <translation>Ievadiet pakas atrašanās vietu</translation>
     </message>
     <message>
         <source>Nothing to do</source>
         <translation>Nav ko darīt</translation>
     </message>
     <message>
         <source>No packages selected</source>
         <translation>Nav atzīmētu paku</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Labi</translation>
     </message>
     <message>
         <source>Do you wish to remove or reinstall
 %1?</source>
         <translation>Vai vēlaties izņemt vai pārinstalēt
 %1?</translation>
     </message>
     <message>
         <source>Remove or ReInstall</source>
         <translation>Izņemt vai Pārinstalēt</translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation>Pārinstalēt</translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation>Vai vēlaties izņemt vai atjaunināt 
 %1?</translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation>Izņemt vai Atjaunināt</translation>
     </message>
     <message>
         <source>Updating Launcher...</source>
         <translation>Atjauninu Palaidēju...</translation>
     </message>
 </context>
 <context>
     <name>PackageWindow</name>
     <message>
         <source>&lt;b&gt;Description&lt;/b&gt; - </source>
         <translation>&lt;b&gt;Apraksts&lt;/b&gt; -</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Instalēts Uz&lt;/b&gt; -</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Izmērs&lt;/b&gt; -</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Atzīme&lt;/b&gt; -</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Faila nosaukums&lt;/b&gt; -</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Instalētā versija&lt;/b&gt; -</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Pieejamā Versija&lt;/b&gt; -</translation>
     </message>
     <message>
         <source>Package Information</source>
         <translation>Pakas Informācija</translation>
     </message>
     <message>
         <source>Package information is unavailable</source>
         <translation>Pakas  informācija nav pieejama</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Aizvērt</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Installed packages</source>
         <translation>Instalētās pakas</translation>
     </message>
     <message>
         <source>Local packages</source>
         <translation>Lokālās pakas</translation>
     </message>
     <message>
         <source>N/A</source>
         <translation>N/P</translation>
     </message>
     <message>
         <source>Package - %1
               version - %2</source>
         <translation>Paka - %1 
              versija - %2</translation>
     </message>
     <message>
         <source>
               inst version - %1</source>
         <translation>
             inst. versija - %1</translation>
     </message>
     <message>
         <source>Version string is empty.</source>
         <translation>Versijas rinda ir tukša.</translation>
     </message>
     <message>
         <source>Epoch in version is not number.</source>
         <translation>Versijas elements nav numurs.</translation>
     </message>
     <message>
         <source>Nothing after colon in version number.</source>
         <translation>Nekā nav pēc versijas numura kola.</translation>
     </message>
 </context>
 <context>
     <name>QuestionDlg</name>
     <message>
         <source>Remove</source>
         <translation>Izņemt</translation>
     </message>
 </context>
 <context>
     <name>SettingsImpl</name>
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,181 +1,149 @@
 <!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>
     </message>
     <message>
         <source>Ok</source>
         <translation>Labi</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Detaļas</translation>
     </message>
     <message>
         <source>Backup and Restore.. Failed !!</source>
         <translation>Kopēšana un Atjaunošana.. Neizdevās !!</translation>
     </message>
     <message>
         <source>Backup and Restore</source>
         <translation>Kopēšana un Atjaunošana</translation>
     </message>
     <message>
         <source>Please select something to restore.</source>
         <translation>Lūdzu norādiet kaut ko atjaunošanai.</translation>
     </message>
     <message>
         <source>Restore Failed.</source>
         <translation>Atjaunošana Neizdevās.</translation>
     </message>
     <message>
         <source>Unable to open File: %1</source>
         <translation>Nevaru atvērt failu: %1</translation>
     </message>
     <message>
         <source>Backup Successful.</source>
         <translation>Kopēšana Pabeigta.</translation>
     </message>
     <message>
         <source>Restore Successful.</source>
         <translation>Atjaunošana Pabeigta.</translation>
     </message>
     <message>
         <source>Backing up...</source>
         <translation>Saglabājam...</translation>
     </message>
     <message>
         <source>Restore Backup...</source>
         <translation>Atjaunojam Saglabāto...</translation>
     </message>
     <message>
         <source>&lt;qt&gt;%1&lt;/qt&gt;</source>
         <translation></translation>
     </message>
     <message>
         <source>Restore</source>
         <translation>Atjaunot</translation>
     </message>
     <message>
         <source>Would you really overwrite your local data?</source>
         <translation>Vai tiešām pārrakstīsiet lokālos datus?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Jā</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nē</translation>
     </message>
 </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>
         <source>&amp;OK</source>
         <translation>&amp;Labi</translation>
     </message>
 </context>
 </TS>
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
@@ -1,189 +1,177 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BacDialog</name>
     <message>
         <source>Blood Alcohol Estimator</source>
         <translation>Alkahola Promiļu Aprēķins</translation>
     </message>
     <message>
         <source># Drinks Consumed</source>
         <translation>Cik Dzērienu Izlietots</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation>Svars</translation>
     </message>
     <message>
         <source>Kilos</source>
         <translation>Kg</translation>
     </message>
     <message>
         <source>Pounds</source>
         <translation>Mārciņas</translation>
     </message>
     <message>
         <source>Units</source>
         <translation>Vienības</translation>
     </message>
     <message>
         <source>Period of Time (hours)</source>
         <translation>Laika perjods (stundas)</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Vīrietis</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Sieviete</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Nezināms</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Dzimums</translation>
     </message>
     <message>
         <source>Beer</source>
         <translation>Alus</translation>
     </message>
     <message>
         <source>Wine</source>
         <translation>Vīns</translation>
     </message>
     <message>
         <source>Shot</source>
         <translation>Šāviens</translation>
     </message>
     <message>
         <source>Type of drink</source>
         <translation>Dzēriena tips</translation>
     </message>
     <message>
         <source>Calculate</source>
         <translation>Aprēķināt</translation>
     </message>
 </context>
 <context>
     <name>Bartender</name>
     <message>
         <source>Bartender</source>
         <translation>Bārmenis</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Fails</translation>
     </message>
     <message>
         <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>
         <source>Name of Drink</source>
         <translation>Dzēriena Nosaukums</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Piezīme</translation>
     </message>
     <message>
         <source>Drink database not opened sucessfully.
 </source>
         <translation>Dzērienu datubāzi neizdevās atvērt.
 </translation>
     </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>
     </message>
     <message>
         <source>Edit Drink</source>
         <translation>Labot Dzērienu</translation>
     </message>
     <message>
         <source>Failed to write to drink database!
 </source>
         <translation>Neizdevās ierakstīt dzērienu datubāzi!</translation>
     </message>
     <message>
         <source>Ingredient</source>
         <translation>Sastāvs</translation>
     </message>
 </context>
 <context>
     <name>New_Drink</name>
     <message>
         <source>Name</source>
         <translation>Vārds</translation>
     </message>
     <message>
         <source>Ingredients</source>
         <translation>Sastāvdaļas</translation>
     </message>
 </context>
 <context>
     <name>Show_Drink</name>
     <message>
         <source>Edit</source>
         <translation>Labot</translation>
     </message>
 </context>
 </TS>
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,335 +1,331 @@
 <!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>
         <source>CE</source>
         <translation>CE</translation>
     </message>
     <message>
         <source>log</source>
         <translation>log</translation>
     </message>
     <message>
         <source>ln</source>
         <translation>ln</translation>
     </message>
     <message>
         <source>(</source>
         <translation>(</translation>
     </message>
     <message>
         <source>)</source>
         <translation>)</translation>
     </message>
     <message>
         <source>sin</source>
         <translation>sin</translation>
     </message>
     <message>
         <source>cos</source>
         <translation>cos</translation>
     </message>
     <message>
         <source>tan</source>
         <translation>tan</translation>
     </message>
     <message>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
         <source>+/-</source>
         <translation>+/-</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>=</source>
         <translation>=</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>.</source>
         <translation>.</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Calculator</source>
         <translation>Kalkulators</translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Standard</source>
         <translation>Standarta</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Standard</source>
         <translation>Standarta</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation>Smagums</translation>
     </message>
     <message>
         <source>Distance</source>
         <translation>Attālums</translation>
     </message>
     <message>
         <source>Area</source>
         <translation>Laukums</translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation>Temperatūras</translation>
     </message>
     <message>
         <source>Volume</source>
         <translation>Tilpums</translation>
     </message>
     <message>
         <source>acres</source>
         <translation>akri</translation>
     </message>
     <message>
         <source>&#xb0;C</source>
         <translation></translation>
     </message>
     <message>
         <source>carats</source>
         <translation>karāti</translation>
     </message>
     <message>
         <source>cm</source>
         <translation></translation>
     </message>
     <message>
         <source>cu cm</source>
         <translation></translation>
     </message>
     <message>
         <source>cu ft</source>
         <translation></translation>
     </message>
     <message>
         <source>cu in</source>
         <translation></translation>
     </message>
     <message>
         <source>&#xb0;F</source>
         <translation></translation>
     </message>
     <message>
         <source>fl oz (US)</source>
         <translation></translation>
     </message>
     <message>
         <source>ft</source>
         <translation></translation>
     </message>
     <message>
         <source>g</source>
         <translation></translation>
     </message>
     <message>
         <source>gal (US)</source>
         <translation></translation>
     </message>
     <message>
         <source>hectares</source>
         <translation>hektāri</translation>
     </message>
     <message>
         <source>in</source>
         <translation></translation>
     </message>
     <message>
         <source>kg</source>
         <translation></translation>
     </message>
     <message>
         <source>km</source>
         <translation></translation>
     </message>
     <message>
         <source>l</source>
         <translation></translation>
     </message>
     <message>
         <source>lb</source>
         <translation></translation>
     </message>
     <message>
         <source>Lg tons</source>
         <translation>Lg tonnas</translation>
     </message>
     <message>
         <source>m</source>
         <translation></translation>
     </message>
     <message>
         <source>mg</source>
         <translation></translation>
     </message>
     <message>
         <source>mi</source>
         <translation></translation>
     </message>
     <message>
         <source>ml</source>
         <translation></translation>
     </message>
     <message>
         <source>mm</source>
         <translation></translation>
     </message>
     <message>
         <source>naut. mi</source>
         <translation></translation>
     </message>
     <message>
         <source>oz</source>
         <translation></translation>
     </message>
     <message>
         <source>points</source>
         <translation>punkti</translation>
     </message>
     <message>
         <source>pt</source>
         <translation></translation>
     </message>
     <message>
         <source>qt</source>
         <translation></translation>
     </message>
     <message>
         <source>sq cm</source>
         <translation>kv cm</translation>
     </message>
     <message>
         <source>sq ft</source>
         <translation>kv p</translation>
     </message>
     <message>
         <source>sq in</source>
         <translation>kv in</translation>
     </message>
     <message>
         <source>sq km</source>
         <translation>kv km</translation>
     </message>
     <message>
         <source>sq m</source>
         <translation>kv m</translation>
     </message>
     <message>
         <source>sq mi</source>
         <translation>kv mi</translation>
     </message>
     <message>
         <source>sq mm</source>
         <translation>kv mm</translation>
     </message>
     <message>
         <source>sq yd</source>
         <translation>kv j</translation>
     </message>
     <message>
         <source>st</source>
         <translation></translation>
     </message>
     <message>
         <source>St tons</source>
         <translation></translation>
     </message>
     <message>
         <source>tblspoon</source>
         <translation>ēdamkarote</translation>
     </message>
     <message>
         <source>teaspoons</source>
         <translation>tējkarote</translation>
     </message>
     <message>
         <source>tonnes</source>
         <translation>tonnas</translation>
     </message>
     <message>
         <source>yd</source>
         <translation>jardi</translation>
     </message>
 </context>
 </TS>
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
@@ -1,276 +1,207 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AlarmDlg</name>
     <message>
         <source>Clock</source>
         <translation>Pulkstenis</translation>
     </message>
     <message>
         <source>Snooze</source>
         <translation>Iemigt</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Aizvērt</translation>
     </message>
 </context>
 <context>
     <name>AlarmDlgBase</name>
     <message>
         <source>Form1</source>
         <translation>Forma1</translation>
     </message>
     <message>
         <source>TextLabel1</source>
         <translation>TekstaZīme1</translation>
     </message>
     <message>
         <source>Snooze</source>
         <translation>Iemigt</translation>
     </message>
     <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>
         <translation>T</translation>
     </message>
     <message>
         <source>Thu</source>
         <comment>Thursday</comment>
         <translation>C</translation>
     </message>
     <message>
         <source>Fri</source>
         <comment>Friday</comment>
         <translation>P</translation>
     </message>
     <message>
         <source>Sat</source>
         <comment>Saturday</comment>
         <translation>Se</translation>
     </message>
     <message>
         <source>Sun</source>
         <comment>Sunday</comment>
         <translation>Sv</translation>
     </message>
     <message>
         <source>Lap/Split</source>
         <translation>Aplis/Sadalīt</translation>
     </message>
     <message>
         <source>&lt;b&gt;Daily Alarm:&lt;/b&gt;&lt;p&gt;</source>
         <translation>&lt;b&gt;Ikdienas Atgādinājums:&lt;/b&gt;&lt;p&gt;</translation>
     </message>
     <message>
         <source>Select Day</source>
         <translation>Izvēlēties Dienu</translation>
     </message>
     <message>
         <source>Daily alarm requires at least
 one day to be selected.</source>
         <translation>Ikdienas atgādinājumam nepieciešams
 izvēlēties vismaz vienu dienu.</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Viss</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
 </context>
 <context>
     <name>ClockBase</name>
     <message>
         <source>Clock</source>
         <translation>Pulkstenis</translation>
     </message>
     <message>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
         <source>Stopwatch</source>
         <translation>Hronometrs</translation>
     </message>
     <message>
         <source>Split</source>
         <translation>Sadalīt</translation>
     </message>
     <message>
         <source>Lap</source>
         <translation>Aplis</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Starts</translation>
     </message>
     <message>
         <source>Starts and stops the stopwatch.</source>
         <translation>Startē un apstādina hronometru.</translation>
     </message>
     <message>
         <source>Lap/Split</source>
         <translation>Aplis/Sadalīt</translation>
     </message>
     <message>
         <source>Resets the stopwatch.</source>
         <translation>Nomet hronometru.</translation>
     </message>
     <message>
         <source>Alarm</source>
         <translation>Modinātājs</translation>
     </message>
     <message>
         <source>Daily Alarm</source>
         <translation>Ikdienas Modinātājs</translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation>Ieslēgts</translation>
     </message>
     <message>
         <source>Check to enable the daily alarm</source>
         <translation>Atzīmējiet lai ieslēgtu ikdienas atgādinājumu</translation>
     </message>
     <message>
         <source>Set the hour the alarm will sound.</source>
         <translation>Norādiet atgādinājuma stundu.</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Set the minute the alarm will sound.</source>
         <translation>Uzstādiet atgādinājuma minūti.</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>Days:</source>
         <translation>Dienas:</translation>
     </message>
     <message>
         <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
@@ -1,729 +1,737 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation>Kalendārs</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Jauns</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>Šodien</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Diena</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Nedēļa</translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation>Nedēļu saraksts</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mēnesis</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Meklēt</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>Labot...</translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation>Notikuma ilgums ir lielāks
 kā intervāls starp atkārtojumiem.</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Nevaru labot datus, patreiz sinhronizēju</translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation>Dubults Notikums</translation>
     </message>
     <message>
         <source>error box</source>
         <translation>kļūdas logs</translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation>Labot to</translation>
     </message>
     <message>
         <source>Continue</source>
         <translation>Turpināt</translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation>Labot Notikumu</translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation>minūtes)</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Labi</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Pietrūkst vietas</translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation>Kalendāram neizdevās saglabāt
 jūsu izmaiņās.
 Atbrīvojat nedaudz vietas un mēģiniet atkal.
 
 Vai Pārtraukt?</translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation>(Nezināms)</translation>
     </message>
     <message>
         <source>Error!</source>
         <translation>Kļūda!</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation>P</translation>
     </message>
     <message>
         <source>T</source>
         <translation>O</translation>
     </message>
     <message>
         <source>W</source>
         <translation>T</translation>
     </message>
     <message>
         <source>F</source>
         <translation>C</translation>
     </message>
     <message>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Pirmdiena</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Otrdiena</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Trešdiena</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Ceturtdiena</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Piektdiena</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sestdiena</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Svētdiena</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Šis ir vairāku dienu notikums.</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Sākums</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Beigas</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Laiks</translation>
     </message>
     <message>
         <source> - </source>
         <translation></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>
 Labot</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplicēt</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Dzēst</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Bīmot</translation>
     </message>
     <message>
         <source>Beam this occurence</source>
         <translation>Bīmot šo ierakstu</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>Calendar</source>
         <translation>Kalendārs</translation>
     </message>
     <message>
         <source>:00 PM</source>
         <translation>:00 PM</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation></translation>
     </message>
     <message>
         <source>PM</source>
         <translation></translation>
     </message>
     <message>
         <source>AM</source>
         <translation></translation>
     </message>
     <message>
         <source>:00</source>
         <translation></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>Parametri</translation>
     </message>
     <message>
         <source>Views</source>
         <translation>Skati</translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation>Noklusētais skats:</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Diena</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Nedēļa</translation>
     </message>
     <message>
         <source>Week List</source>
         <translation>Nedēļas</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mēnesis</translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation>Pārvietoties uz tekošo laiku</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>Rindas stils:</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Noklusēts</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Vidējs</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Liels</translation>
     </message>
     <message>
         <source>Time display</source>
         <translation>Laika displejs</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nekas</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Sākums</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation>Sākums-Beigas</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Dažādi</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation>Atgādinājuma Uzstādījumi</translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation>Atgādinājums Pēc</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>minūtes</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation>Sākt skatīt notikumus</translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation>Sākuma Laiks:</translation>
     </message>
     <message>
         <source>:00</source>
         <translation></translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Noklusētie</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Atrašanās:</translation>
     </message>
     <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>
         <translation>n</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Jan</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
         <translation>POTCPSSP</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstEvent</name>
     <message>
         <source>Edit</source>
         <translation>
 Labot</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplicēt</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Dzēst</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Bīmot</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>n</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>N: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation></translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Start Time</source>
         <translation>Sākuma Laiks</translation>
     </message>
     <message>
         <source>End Time</source>
         <translation>Beigu Laiks</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Kalendārs</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>Atkārtot...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>Ik dienas...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>Ik nedēļu...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>Ik mēnesi...</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>Ik gadu...</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Neatkārtot...</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>Jauns Notikums</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Atrašanās vieta</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategorija</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Tikšanās</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Pusdienas</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Vakariņas</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Ceļojums</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Apraksts</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Ofiss</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Mājas</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>Sākt - Beigt</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation></translation>
     </message>
     <message>
         <source>Start time</source>
         <translation>Sākuma laiks</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Visu dienu</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Laika zona</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Brīdinājums</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>minūtes</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Klusi</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Skaļi</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Atkārtot</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Neatkārtot...</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Piezīme...</translation>
     </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Labot Piezīmi</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Pusdienas</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Sākt</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Beigt</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Katru</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 katru</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>%1 katru</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>%1 %1 no katra</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Katru</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Pirmodienu</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Otrdienu</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Trešdienu</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Ceturtdienu</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Piektdienu</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sestdienu</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Svētdienu</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>ais</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>ais</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>šais</translation>
     </message>
     <message>
         <source>th</source>
         <translation>ais</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation>Neatkārtot</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>dienu(as)</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>nedēļu(as)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Atkārtot Pēc</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dienas</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datuma</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>mēnesis(ši)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>gads(i)</translation>
     </message>
     <message>
         <source>days</source>
         <translation>dienas</translation>
     </message>
     <message>
         <source>day</source>
         <translation>diena</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>nedēļas</translation>
     </message>
     <message>
         <source>week</source>
         <translation>nedēļa</translation>
     </message>
     <message>
         <source>month</source>
         <translation>mēnesis</translation>
     </message>
     <message>
         <source>year</source>
         <translation>gads</translation>
     </message>
     <message>
         <source> and </source>
         <translation>un</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
  un</translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, un</translation>
     </message>
     <message>
         <source>on </source>
         <translation>uz</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Atkārtots Notikums</translation>
     </message>
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,71 +1,68 @@
 <!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>
     </message>
     <message>
         <source>Stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
         <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>
     </message>
 </context>
 </TS>
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
@@ -1,111 +1,95 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>System</name>
     <message>
         <source>Command : </source>
         <translation>Komanda :</translation>
     </message>
     <message>
         <source>State should be off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State should at least be off</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TheNSResources</name>
     <message>
         <source>Network Device</source>
         <translation>Tīkla Iekārta</translation>
     </message>
     <message>
         <source>Character device</source>
         <translation>Burtu iekārta</translation>
     </message>
     <message>
         <source>IP Connection</source>
         <translation>IP Savienojums</translation>
     </message>
     <message>
         <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>
         <source>&lt;p&gt;Connection to a GPRS capable device&lt;/p&gt;</source>
         <translation type="unfinished"></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>networksettings2</name>
     <message>
         <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
@@ -1,100 +1,96 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation>Kalendāra Poga</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation>Kontakti Poga</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation>Izvēlnes Poga</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation>Pasta Poga</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation>Mājas Poga</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation>Ieraksta Poga</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation>Zemākā+Augšā</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation>Zemāk-Lejā</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation>Zemāk+Pa labi</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation>Zemāk+Pa kreisi</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation>Augstāk+Augšā</translation>
     </message>
     <message>
         <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>
         <source>Todo Button</source>
         <translation>Darbi Poga</translation>
     </message>
     <message>
         <source>Hinge1</source>
         <translation>Hinge1</translation>
     </message>
     <message>
         <source>Hinge2</source>
         <translation></translation>
     </message>
     <message>
         <source>Hinge3</source>
         <translation></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Trash</source>
         <translation>Atkritumi</translation>
     </message>
 </context>
 </TS>
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,56 +1,40 @@
 <!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>
         <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>Esiet uzmanīti: ja šī nebija &lt;b&gt;simulācija&lt;/b&gt;, jums nepieciešams atkārtot visus soļus.</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>Lūdzu meklējiet īpašnieku (skat. zemāk), vai mēģiniet atkal klikšķinot uz šī ekrāna (un sagaidot soda laiku) ja tiešām esat īpašnieks</translation>
     </message>
 </context>
 </TS>
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,209 +1,175 @@
 <!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>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Izvēlaties Laiku:</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation>Vārds</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Izmērs</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datums</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation>Mime Tips</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished">FailuDialogs</translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished">Atvērt</translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished">Saglabāt</translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished">Izvēlēties Katalogu</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation>Vārds:</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation type="unfinished">Stils</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished">Izmērs</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished">Glāžšķūņu utt</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation>Konfigurācijas Atslēga</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation></translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation>Vārds</translation>
     </message>
     <message>
         <source>Key</source>
         <translation>Atslēga</translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation>Noklusētā Atslēga</translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation>Īsinājumikona Atzīmētai Darbībai</translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation>&amp;Nekas</translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation>N&amp;oklusētais</translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation>&amp;Pielāgots</translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation>Konfigurēšanas Atslēga</translation>
     </message>
     <message>
         <source>Default: </source>
         <translation>Noklusētais:</translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation>Atslēga ir MelnajāSarakstā</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>&lt;qt&gt;Atslēga kuru jūs izvēlējāties ir melnajā sarakstā un to nevar reģistrēt ar šo menedžeri.  Lūdzu lietojiet citu atslēgu.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation>Atslēga jau ir piesaistīta</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;Izvēlētā atslēga jau ir izvēlēta citai konigurācijai.  Lūdzu izmantojiet citu atslēgu.&lt;/qt&gt;</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Documents</source>
         <translation>Dokumenti</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>Faili</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation>Visi Faili</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nekas</translation>
     </message>
     <message>
         <source>Directories</source>
         <translation>Katalogi</translation>
     </message>
     <message>
         <source>All Directories</source>
         <translation>Visi Katalogi</translation>
     </message>
 </context>
 </TS>
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
@@ -1,315 +1,291 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>PPPAuthEdit</name>
     <message>
         <source>Login send missing</source>
         <translation>Trūkst lietotāja nosūtīšana</translation>
     </message>
     <message>
         <source>Login expect missing</source>
         <translation>Trūkst lietotāja sagaidīšana</translation>
     </message>
     <message>
         <source>Password send missing</source>
         <translation>Trūkst paroles nosūtīšana</translation>
     </message>
     <message>
         <source>Password expect missing</source>
         <translation>Trūkst paroles sagaidīšana</translation>
     </message>
     <message>
         <source>Pap/Chap/EAP client id missing</source>
         <translation>Trūkst Pap/Chap/EAP klienta id</translation>
     </message>
     <message>
         <source>Pap/Chap/EAP server id missing</source>
         <translation>Trūkst Pap/Chap/EAP servera id</translation>
     </message>
     <message>
         <source>Pap/Chap/EAP secret id missing</source>
         <translation>Trūkst Pap/Chap/EAP drošības id</translation>
     </message>
 </context>
 <context>
     <name>PPPAuthGUI</name>
     <message>
         <source>PPPAuth</source>
         <translation>PPPAuth</translation>
     </message>
     <message>
         <source>Login</source>
         <translation>Pieslēgums</translation>
     </message>
     <message>
         <source>ogin:</source>
         <translation>ieslēgums:</translation>
     </message>
     <message>
         <source>assword:</source>
         <translation>arole:</translation>
     </message>
     <message>
         <source>Pap</source>
         <translation>Pap</translation>
     </message>
     <message>
         <source>Chap</source>
         <translation>Chap</translation>
     </message>
     <message>
         <source>EAP</source>
         <translation></translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Serveris</translation>
     </message>
     <message>
         <source>Secret</source>
         <translation>Drošība</translation>
     </message>
     <message>
         <source>*</source>
         <translation>*</translation>
     </message>
     <message>
         <source>Client</source>
         <translation>Klients</translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation>Termināls</translation>
     </message>
 </context>
 <context>
     <name>PPPDNSEdit</name>
     <message>
         <source>Domainname needed</source>
         <translation>Nepieciešams domaina vārds</translation>
     </message>
     <message>
         <source>DNS Servers needed</source>
         <translation>Nepieciešams DNS serveris</translation>
     </message>
 </context>
 <context>
     <name>PPPDNSGUI</name>
     <message>
         <source>PPPDNS</source>
         <translation>PPPDNS</translation>
     </message>
     <message>
         <source>Server assigned</source>
         <translation>Uzrādītais serveris</translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation>Fiksēts</translation>
     </message>
     <message>
         <source>DomainName</source>
         <translation>DomainaVārds</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Adrese</translation>
     </message>
     <message>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
         <source>List</source>
         <translation>Saraksts</translation>
     </message>
 </context>
 <context>
     <name>PPPDialingGUI</name>
     <message>
         <source>PPPDialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>GPRS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>APN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished">...</translation>
     </message>
     <message>
         <source>New Item</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PPPGUI</name>
     <message>
         <source>PPP</source>
         <translation>PPP</translation>
     </message>
     <message>
         <source>Authentication</source>
         <translation>Autentifikācija</translation>
     </message>
     <message>
         <source>IP settings</source>
         <translation>IP uzstādījumi</translation>
     </message>
     <message>
         <source>DNS Settings</source>
         <translation>DNS Uzstādījumi</translation>
     </message>
     <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>
         <translation>PPPIP</translation>
     </message>
     <message>
         <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>
         <source>Local</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server Overrules</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upon connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Before</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>After</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upon disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;UL&gt;
 &lt;LI&gt;Commands run under your &lt;b&gt;real&lt;/b&gt; user id (&lt;b&gt;not&lt;/b&gt; as root)&lt;/LI&gt;
 &lt;LI&gt;Supply the whole path&lt;/LI&gt;
 &lt;/UL&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,164 +1,152 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ProfileGUI</name>
     <message>
         <source>Profile</source>
         <translation>Profails</translation>
     </message>
     <message>
         <source>Setup</source>
         <translation>Uzstādījumi</translation>
     </message>
     <message>
         <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>
         <source>eth0</source>
         <translation></translation>
     </message>
     <message>
         <source>(Multicast, Up)</source>
         <translation></translation>
     </message>
     <message>
         <source>Subnet Mask</source>
         <translation>Tīkla Maska</translation>
     </message>
     <message>
         <source>Broadcast</source>
         <translation>Raidīšana</translation>
     </message>
     <message>
         <source>MAC</source>
         <translation>MAC</translation>
     </message>
     <message>
         <source>P-t-P</source>
         <translation>P-t-P</translation>
     </message>
     <message>
         <source>IP Address</source>
         <translation>IP Adrese</translation>
     </message>
     <message>
         <source>0.0.0.0</source>
         <translation></translation>
     </message>
     <message>
         <source>00:00:00:00:00:00</source>
         <translation></translation>
     </message>
     <message>
         <source>DHCP</source>
         <translation>DHCP</translation>
     </message>
     <message>
         <source>Lease Expires</source>
         <translation>Zaudē Spēku</translation>
     </message>
     <message>
         <source>Lease Obtained</source>
         <translation>Saņemtais</translation>
     </message>
     <message>
         <source>DHCP Server</source>
         <translation>DHCP Serveris</translation>
     </message>
     <message>
         <source>Traffic</source>
         <translation>Trafiks</translation>
     </message>
     <message>
         <source>Receiving</source>
         <translation>Saņemšana</translation>
     </message>
     <message>
         <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>
         <source>Pkt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ODO</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Miscellaneous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reset ODO</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ProfileNetNode</name>
     <message>
         <source>Regular connection profile</source>
         <translation>Regulārā pieslēguma profails</translation>
     </message>
     <message>
         <source>&lt;p&gt;Define use of an IP connection.&lt;/p&gt;&lt;p&gt;Configure if and when this connection needs to be established&lt;/p&gt;</source>
         <translation>&lt;p&gt;Definētais IP konekcijas pielietojums.&lt;/p&gt;&lt;p&gt;Konfigurējiet ja nepieciešams savienojums&lt;/p&gt;</translation>
     </message>
 </context>
 </TS>
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,114 +1,102 @@
 <!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>
         <source>The next birthdays will just be shown, if enabled!</source>
         <translation>Ja ieslēgsiet tiks rādītas nākamās dzimšanasdienas!</translation>
     </message>
     <message>
         <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>
         <source>Colors for the headlines !</source>
         <translation>Krāsas virsrakstiem !</translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
         <translation>Uzstādiet Ievada Krāsu:</translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation>Šī krāsa tiks lietota lai parādītu svinamdienas !</translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation>Svarīgi
 Krāsa ja zemāk</translation>
     </message>
     <message>
         <source> days: </source>
         <translation>dienas:</translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation>Šī svarīgi krāsa tiks lietota ja tā ir tuvu notikumam !</translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation>Speciāla krāsa tiks lietota ja dzimšanas diena būs tuvāka par doto dienu skaitu !</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>AddressBook plugin</source>
         <translation>AdresuGrāmatas spraudnis</translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation>Datubāze nepiedāvā šo meklēšanas pieprasījumu ! Lūdzu atjauniniet libOpie !&lt;br&gt;</translation>
     </message>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>Nākamās dzimšanas dienas pēc &lt;b&gt; %1 &lt;/b&gt; dienām:</translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>Nav dzimšanasdienu &lt;b&gt; %1 &lt;/b&gt; dienās!</translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>Nākamās dzimšanas dienas &lt;b&gt; %1 &lt;/b&gt; dienās:</translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>Nav svinamdienu &lt;b&gt; %1 &lt;/b&gt; dienās!</translation>
     </message>
 </context>
 </TS>
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
@@ -1,316 +1,328 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BaseSetup</name>
     <message>
         <source> seconds</source>
         <translation>sekundes</translation>
     </message>
     <message>
         <source>Slideshow timeout:</source>
         <translation>Slaidšova pārtraukums:</translation>
     </message>
     <message>
         <source> pixel</source>
         <translation>pikseļi</translation>
     </message>
     <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>
         <source>Toggle autoscale</source>
         <translation>Pārslēgt autoskalēšanu</translation>
     </message>
     <message>
         <source>Switch to next image</source>
         <translation>Pāriet uz nākamo attēlu</translation>
     </message>
     <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>
         <source>Delete Current Item</source>
         <translation>Dzēst Tekošo</translation>
     </message>
     <message>
         <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>
         <source>Imageinfo Keyboard Actions</source>
         <translation>Attēlinfo Klaviatūras Darbības</translation>
     </message>
     <message>
         <source>Imageview Keyboard Actions</source>
         <translation>Atēlskata Klaviatūras Darbības</translation>
     </message>
     <message>
         <source>Go dir up</source>
         <translation>Iet direktoriju uz augšu</translation>
     </message>
     <message>
         <source>Beam file</source>
         <translation>Bīmot failu</translation>
     </message>
     <message>
         <source>Show imageinfo</source>
         <translation>Rādīt attēla info</translation>
     </message>
     <message>
         <source>Delete file</source>
         <translation>Dzēst failu</translation>
     </message>
     <message>
         <source>Display image</source>
         <translation>Attēlot atēlu</translation>
     </message>
     <message>
         <source>Start slideshow</source>
         <translation>Sākt slaidšovu</translation>
     </message>
     <message>
         <source>Show toolbar</source>
         <translation>Attēlot komandpogas</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Uzstādījumi</translation>
     </message>
     <message>
         <source>Thumbnail and Imageinfo</source>
         <translation>Ikonu un attēlinfo</translation>
     </message>
     <message>
         <source>Thumbnail and name</source>
         <translation>Ikonu un nosaukuma</translation>
     </message>
     <message>
         <source>Name only</source>
         <translation>Tikai vārds</translation>
     </message>
     <message>
         <source>Next image</source>
         <translation>Nākamais attēls</translation>
     </message>
     <message>
         <source>Previous image</source>
         <translation>Iepriekšējais attēls</translation>
     </message>
     <message>
         <source>Show images fullscreen</source>
         <translation>Attēlot attēlus pilnekrānā</translation>
     </message>
     <message>
         <source>Auto rotate images</source>
         <translation>Autorotēt atēlus</translation>
     </message>
     <message>
         <source>Show images unscaled</source>
         <translation>Attēlot nemērogotus</translation>
     </message>
     <message>
         <source>Show zoomer window when unscaled</source>
         <translation>Atēlot lupas logu kad nemērogots</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Fails</translation>
     </message>
     <message>
         <source>Show</source>
         <translation>Attēlot</translation>
     </message>
     <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>
         <source>&lt;center&gt;&lt;b&gt;Be carefull with the following options!&lt;/b&gt;&lt;/center&gt;</source>
         <translation>&lt;center&gt;&lt;b&gt;Esiet uzmanīgi uzstādot šīs opcijas!&lt;/b&gt;&lt;/center&gt;</translation>
     </message>
     <message>
         <source>Show files recursive</source>
         <translation>Rādīt failus rekursīvi</translation>
     </message>
     <message>
         <source>Recursion depth:</source>
         <translation>Rekursijas dziļums:</translation>
     </message>
     <message>
         <source> directories</source>
         <translation>direktoriji</translation>
     </message>
     <message>
         <source>Digital Camera View</source>
         <translation>Digitālās Kameras Skats</translation>
     </message>
     <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>
         <source>Name Only</source>
         <translation>Tikai Vārds</translation>
     </message>
 </context>
 <context>
     <name>imageinfo</name>
     <message>
         <source>View Full Image</source>
         <translation>Pilnsekrāna Attēls</translation>
     </message>
     <message>
         <source>Image info</source>
         <translation>Attēla info</translation>
     </message>
     <message>
         <source>Displays an thumbnail of the image</source>
         <translation>Attēlo attēla ikonu</translation>
     </message>
     <message>
         <source>Displays info of selected image</source>
         <translation>Attēlo info</translation>
     </message>
 </context>
 </TS>
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
@@ -1,407 +1,272 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Title</source>
         <translation>Virsraksts</translation>
     </message>
     <message>
         <source>Author</source>
         <translation>Autors</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Apraksts</translation>
     </message>
     <message>
         <source>Copyright</source>
         <translation>Autortiesības</translation>
     </message>
     <message>
         <source>Creation Time</source>
         <translation>Izveides Laiks</translation>
     </message>
     <message>
         <source>Software</source>
         <translation>Programmatūra</translation>
     </message>
     <message>
         <source>Disclaimer</source>
         <translation>Disc</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Uzmanību</translation>
     </message>
     <message>
         <source>Source</source>
         <translation>Avots</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Komentāri</translation>
     </message>
     <message>
         <source>Grayscale</source>
         <translation>Tonēts</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Nezināms</translation>
     </message>
     <message>
         <source>RGB</source>
         <translation>RGB</translation>
     </message>
     <message>
         <source>Palette</source>
         <translation>Palete</translation>
     </message>
     <message>
         <source>Grayscale/Alpha</source>
         <translation>Tonēts/Alpha</translation>
     </message>
     <message>
         <source>RGB/Alpha</source>
         <translation>RGB/Alpha</translation>
     </message>
     <message>
         <source>Deflate</source>
         <translation>Samazināt</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nav</translation>
     </message>
     <message>
         <source>Adam7</source>
         <translation>Adam7</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Not a GIF file</source>
         <translation>Nav GIF fails</translation>
     </message>
     <message>
         <source>Dimensions: %1x%2
 </source>
         <translation>Dimensijas: %1x%2
 </translation>
     </message>
     <message>
         <source>Depth: %1 bits
 </source>
         <translation>Dziļums: %1 biti
 </translation>
     </message>
     <message>
         <source>Sort Flag: %1
 </source>
         <translation>Sortēšana: %1
 </translation>
     </message>
     <message>
         <source>Size of Global Color Table: %1 colors
 </source>
         <translation>Izmērs Globālā Krāsu Tabulā: %1 krāsas
 </translation>
     </message>
     <message>
         <source>Background Color Index: %1
 </source>
         <translation>Fona Krāsas Indekss: %1
 </translation>
     </message>
     <message>
         <source>Pixel Aspect Ratio: %1 (Aspect Ratio %2)
 </source>
         <translation>Pikseļu Aspekts: %1 (Aspekts %2)
 </translation>
     </message>
     <message>
         <source>Comment: %1
 </source>
         <translation>Komentārs: %1
 </translation>
     </message>
     <message>
         <source>Depth: %1
 </source>
         <translation>Dziļums: %1
 </translation>
     </message>
     <message>
         <source>ColorMode: %1
 </source>
         <translation>KrāsuRežīms: %1
 </translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Nezināms</translation>
     </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>
         <source>Manufacturer: %1
 </source>
         <translation>Ražotājs: %1
 </translation>
     </message>
     <message>
         <source>Model: %1
 </source>
         <translation>Modelis: %1
 </translation>
     </message>
     <message>
         <source>Orientation: %1
 </source>
         <translation>Orientācija: %1
 </translation>
     </message>
     <message>
         <source>Flash used
 </source>
         <translation>Pielietotais Flash
 </translation>
     </message>
     <message>
         <source>Focal length: %1
 </source>
         <translation>Fokāla garums: %1
 </translation>
     </message>
     <message>
         <source>35mm equivalent: %1
 </source>
         <translation>35mm ekvivalents: %1
 </translation>
     </message>
     <message>
         <source>CCD width: %1</source>
         <translation>CCD platums: %1</translation>
     </message>
     <message>
         <source>Exposure time: %1
 </source>
         <translation>Attīstīšanas laiks: %1
 </translation>
     </message>
     <message>
         <source>Aperture: %1
 </source>
         <translation>Atklāšana: %1
 </translation>
     </message>
     <message>
         <source>Distance: %1
 </source>
         <translation>Attālums: %1
 </translation>
     </message>
     <message>
         <source>Infinite</source>
         <translation>Vienkārši</translation>
     </message>
     <message>
         <source>ISO equivalent: %1
 </source>
         <translation>ISO ekvivalents: %1
 </translation>
     </message>
     <message>
         <source>EXIF comment: %1</source>
         <translation>EXIF komentārs: %1</translation>
     </message>
     <message>
         <source>&lt;/qt&gt;</source>
         <translation></translation>
     </message>
     <message>
         <source>Dimensions: %1 x %2
 </source>
         <translation>Dimensijas: %1 x %2
 </translation>
     </message>
     <message>
         <source>Size: %1
 </source>
         <translation>Izmērs: %1
 </translation>
     </message>
     <message>
         <source>Compressed size: %1</source>
         <translation>Saspiests izmērs: %1</translation>
     </message>
     <message>
         <source>used colors: %1
 </source>
         <translation>pielietotās krāsas: %1
 </translation>
     </message>
     <message>
         <source>Resolution: %1 x %2
 </source>
         <translation>Izšķirtspēja: %1 x %2
 </translation>
     </message>
 </context>
 </TS>
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
@@ -1,1027 +1,1027 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CellFormat</name>
     <message>
         <source>&amp;Borders</source>
         <translation>&amp;Apmales</translation>
     </message>
     <message>
         <source>Back&amp;ground</source>
         <translation>F&amp;ons</translation>
     </message>
     <message>
         <source>&amp;Font</source>
         <translation>&amp;Fonts</translation>
     </message>
     <message>
         <source>&amp;Alignment</source>
         <translation>&amp;Izlīdzināšana</translation>
     </message>
     <message>
         <source>&amp;Width:</source>
         <translation>&amp;Platums:</translation>
     </message>
     <message>
         <source>&amp;Color:</source>
         <translation>&amp;Krāsa:</translation>
     </message>
     <message>
         <source>&amp;Default Borders</source>
         <translation>&amp;Noklusētās Apmales</translation>
     </message>
     <message>
         <source>&amp;Style:</source>
         <translation>&amp;Stils:</translation>
     </message>
     <message>
         <source>&amp;Default Background</source>
         <translation>&amp;Noklusētais Fons</translation>
     </message>
     <message>
         <source>&amp;Font:</source>
         <translation>&amp;Fonts:</translation>
     </message>
     <message>
         <source>&amp;Size:</source>
         <translation>&amp;Izmērs:</translation>
     </message>
     <message>
         <source>&amp;Bold</source>
         <translation>&amp;Trekns</translation>
     </message>
     <message>
         <source>&amp;Italic</source>
         <translation>&amp;Slīpraksts</translation>
     </message>
     <message>
         <source>&amp;Default Font</source>
         <translation>&amp;Noklusētais Fonts</translation>
     </message>
     <message>
         <source>&amp;Vertical:</source>
         <translation>&amp;Vertikāli:</translation>
     </message>
     <message>
         <source>&amp;Horizontal:</source>
         <translation>&amp;Hoirzontāli:</translation>
     </message>
     <message>
         <source>&amp;Word Wrap</source>
         <translation>&amp;Pārnešana</translation>
     </message>
     <message>
         <source>&amp;Default Alignment</source>
         <translation>&amp;Noklulsētais Izlīdzinājums</translation>
     </message>
     <message>
         <source>Format Cells</source>
         <translation>Noformēt Rūtiņas</translation>
     </message>
     <message>
         <source>Opie Sheet</source>
         <translation>Opie Tabula</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>&amp;Find &amp;&amp; Replace</source>
         <translation>&amp;Meklēt &amp;&amp; Aizvietot</translation>
     </message>
     <message>
         <source>&amp;Options</source>
         <translation>&amp;Opcijas</translation>
     </message>
     <message>
         <source>&amp;Search for:</source>
         <translation>&amp;Meklēt:</translation>
     </message>
     <message>
         <source>&amp;Replace with:</source>
         <translation>&amp;Aizvietot ar:</translation>
     </message>
     <message>
         <source>&amp;Type</source>
         <translation>&amp;Tips</translation>
     </message>
     <message>
         <source>&amp;Find</source>
         <translation>&amp;Meklēt</translation>
     </message>
     <message>
         <source>&amp;Replace</source>
         <translation>&amp;Aizvietot</translation>
     </message>
     <message>
         <source>Replace &amp;all</source>
         <translation>Aizvietot &amp;visu</translation>
     </message>
     <message>
         <source>Match &amp;case</source>
         <translation>Sekot &amp;reģistram</translation>
     </message>
     <message>
         <source>Current &amp;selection only</source>
         <translation>Tikai &amp;tekošo iezīmēto</translation>
     </message>
     <message>
         <source>&amp;Entire cell</source>
         <translation>&amp;Visu rūtiņu</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <source>Invalid file format!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to save the current file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;File Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>UnnamedFile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save &amp;As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import Excel file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import E&amp;xcel file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cell Selector</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cell &amp;Selector</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cut Cells</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cu&amp;t</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Cells</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste Cells</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste Contents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste Cont&amp;ents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear Cells</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;lear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Insert Cells</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ells</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Insert Rows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Rows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Insert Columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add Sheets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Sheets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cells</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cells</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Row Height</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>H&amp;eight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Adjust Row</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Adjust</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Row</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide Row</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Hide</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Column Width</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Width</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Adjust Column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide Column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename Sheet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Sheet</source>
         <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>
     </message>
     <message>
         <source>&amp;Addition</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subtraction</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Subtraction</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Multiplication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Multiplication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Division</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Division</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open ParanthesistempCellData-&gt;row+row1, tempCellData-&gt;col+col1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Open Paranthesis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Paranthesis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Close Paranthesis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comma</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Comma</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Insert</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Row</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colum&amp;n</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Sheet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Function</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Simple</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ABS(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CEILING(x,acc)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FACT(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FLOOR(x,acc)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>INT(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MOD(x,y)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ROUND(x,digits)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SIGN(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>EXP(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>LN(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>LOG(x,b)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>LOG10(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>POWER(x,y)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SQRT(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DEGREES(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RADIANS(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PI()</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RAND()</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RANDBETWEEN(a,b)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S&amp;tandard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AND(x1,x2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>NOT(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OR(x1,x2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IF(compare,val1,val2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>INDEX(range,index)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ISBLANK(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ISNUMBER(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>EVEN(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ISEVEN(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ODD(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ISODD(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Logical-&amp;Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SIN(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>COS(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>TAN(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ASIN(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ACOS(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ATAN(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ATAN2(x,y)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SINH(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>COSH(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>TANH(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ACOSH(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ASINH(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ATANH(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Trigonometric</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>LEN(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>LEFT(s,num)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RIGHT(s,num)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MID(s,pos,len)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CONCATENATE(s1,s2..)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>EXACT(s1,s2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FIND(what,where,pos)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>REPLACE(s,pos,len,ns)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>REPT(s,n)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>UPPER(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>LOWER(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Strings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AVERAGE(range)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>COUNT(range)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>COUNTIF(range,eqls)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAX(range)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MIN(range)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SUM(range)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SUMSQ(range)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>VAR(range)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>VARP(range)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>STDEV(range)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>STDEVP(range)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SKEW(range)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>KURT(range)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sta&amp;tistical</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BESSELI(x,n)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BESSELJ(x,n)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BESSELK(x,n)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BESSELY(x,n)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BETAI(x,a,b)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ERF(a,b)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ERFC(a,b)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>GAMMALN(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>GAMMAP(x,a)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>GAMMAQ(x,a)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scienti&amp;fic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BETADIST(z,a,b,Q?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CHI2DIST(x,n,Q?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CHIDIST(x,n,Q?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FDIST(z,deg1,deg2,Q?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>GAMMADIST(x,a,b,Q?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>NORMALDIST(x,m,s,Q?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PHI(x,Q?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>POISSON(x,n,Q?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Distributions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Functions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About Opie Sheet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie Sheet
 Spreadsheet Software for Opie
 QWDC Beta Winner (as Sheet/Qt)
 
 Developed by: Serdar Ozler
 Release 1.0.2
 Release Date: October 08, 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="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Number of rows:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Number of columns:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Number of sheets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sheet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Height of each row:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Width of each column:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;td&gt;Unable to open or parse file!&lt;/td&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Sheet Name:</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>
     </message>
     <message>
         <source>Entire &amp;column</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Sheet</name>
     <message>
         <source>Error</source>
         <translation>Kļūda</translation>
     </message>
     <message>
         <source>Search key not found!</source>
         <translation>Meklētā atslēga nav atrasta!</translation>
     </message>
 </context>
 <context>
     <name>SortDialog</name>
     <message>
         <source>&amp;Sort</source>
         <translation>&amp;Šķirot</translation>
     </message>
     <message>
         <source>&amp;Options</source>
         <translation>&amp;Opcijas</translation>
     </message>
     <message>
         <source>&amp;Sort by</source>
         <translation>&amp;Šķirot pēc</translation>
     </message>
     <message>
         <source>&amp;Then by</source>
         <translation>&amp;Tad pēc</translation>
     </message>
     <message>
         <source>Then &amp;by</source>
         <translation>Tad &amp;pēc</translation>
     </message>
     <message>
         <source>&amp;Case Sensitive</source>
         <translation>&amp;Reģistrjūtīgs</translation>
     </message>
     <message>
         <source>&amp;Direction</source>
         <translation>&amp;Virziens</translation>
     </message>
     <message>
         <source>&amp;Top to bottom (rows)</source>
         <translation>&amp;No augšas uz leju (rindas)</translation>
     </message>
     <message>
         <source>&amp;Left to right (columns)</source>
         <translation>&amp;Kreisā uz labo (kolonnas)</translation>
     </message>
     <message>
         <source>Sort</source>
         <translation>Šķirot</translation>
     </message>
     <message>
         <source>&amp;Ascending</source>
         <translation>&amp;Dilstoši</translation>
     </message>
     <message>
         <source>&amp;Descending</source>
         <translation>&amp;Pieaugoši</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Kļūda</translation>
     </message>
     <message>
         <source>One cell cannot be sorted!</source>
         <translation>Vienu rūtiņu nevar šķirot!</translation>
     </message>
 </context>
 </TS>
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
@@ -1,843 +1,880 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AccountView</name>
     <message>
         <source>Error creating new Folder</source>
         <translation>Kļūda veidojot jaunu Folderi</translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation>&lt;center&gt;Kļūda veidojot&lt;br&gt;jaunu folderi - pārtraucu.&lt;/center&gt;</translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation>Nav ierakstu adresu grāmatā.</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Kļūda</translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Jums jānorāda vismaz viena adrese.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Labi</translation>
     </message>
 </context>
 <context>
     <name>AddressPickerUI</name>
     <message>
         <source>Address Picker</source>
         <translation>Adreses Izvēle</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Labi</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Atlikt</translation>
     </message>
 </context>
 <context>
     <name>ComposeMail</name>
     <message>
         <source>Name</source>
         <translation>Vārds</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Izmērs</translation>
     </message>
     <message>
         <source>Problem</source>
         <translation>Problēma</translation>
     </message>
     <message>
         <source>&lt;p&gt;Please create an SMTP account first.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Lūdzu vispirms izveidojiet SMTP kontu.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Labi</translation>
     </message>
     <message>
         <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>
         <source>No</source>
         <translation>Nē</translation>
     </message>
     <message>
         <source>&lt;center&gt;Attachments will not be stored in &quot;Draft&quot; folder&lt;/center&gt;</source>
         <translation>&lt;center&gt;Piesaistne netiks saglabāt &quot;Melnraksti&quot; mapē&lt;/center&gt;</translation>
     </message>
     <message>
         <source>No Receiver specified</source>
         <translation>Nav uzrādīts Saņēmējs</translation>
     </message>
 </context>
 <context>
     <name>ComposeMailUI</name>
     <message>
         <source>Compose Message</source>
         <translation>Veidot Vēstuli</translation>
     </message>
     <message>
         <source>send later</source>
         <translation>nosūtīt vēlāk</translation>
     </message>
     <message>
         <source>use:</source>
         <translation>lietot:</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Pasts</translation>
     </message>
     <message>
         <source>Subject</source>
         <translation>Temats</translation>
     </message>
     <message>
         <source>From</source>
         <translation>No</translation>
     </message>
     <message>
         <source>To</source>
         <translation>Kam</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opcijas</translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation>Atbildēt</translation>
     </message>
     <message>
         <source>BCC</source>
         <translation>BCC</translation>
     </message>
     <message>
         <source>Signature</source>
         <translation>Paraksts</translation>
     </message>
     <message>
         <source>CC</source>
         <translation>CC</translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation>Pielikums</translation>
     </message>
     <message>
         <source>Delete File</source>
         <translation>Dzēst Failu</translation>
     </message>
     <message>
         <source>Add File</source>
         <translation>Pievienot Failu</translation>
     </message>
 </context>
 <context>
     <name>EditAccounts</name>
     <message>
         <source>Account</source>
         <translation>Pieslēgums</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Tips</translation>
     </message>
     <message>
         <source>Question</source>
         <translation>Jautājums</translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete the selected Account?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Vai tiešām vēlaties dzēst iezīmēto Pieslēgumu?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Jā</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nē</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Kļūda</translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select an account.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Lūdzu izvēlaties pieslēgumu.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Labi</translation>
     </message>
 </context>
 <context>
     <name>EditAccountsUI</name>
     <message>
         <source>Configure Accounts</source>
         <translation>Konfigurēt Pieslēgumus</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Pasts</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Dzēst</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Jauns</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Pieslēguma Vārds</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Labot</translation>
     </message>
     <message>
         <source>News</source>
         <translation>Ziņas</translation>
     </message>
 </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>
         <source>Name of the Account</source>
         <translation>Pieslēguma Vārds</translation>
     </message>
     <message>
         <source>Account</source>
         <translation>Pieslēgums</translation>
     </message>
     <message>
         <source>Prefix</source>
         <translation>Prefikss</translation>
     </message>
     <message>
         <source>ssh $SERVER exec</source>
         <translation>ssh $SERVER exec</translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation>Lietot secure sockets:</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Mail</source>
         <translation>Pasts</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Uzstādījumi</translation>
     </message>
     <message>
         <source>Compose new mail</source>
         <translation>Veidot jaunu vēstuli</translation>
     </message>
     <message>
         <source>Send queued mails</source>
         <translation>Sūtīt pastu no rindas</translation>
     </message>
     <message>
         <source>Show/Hide folders</source>
         <translation>Slēpt/Rādīt mapes</translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation>Dzēst Pastu</translation>
     </message>
     <message>
         <source>Edit settings</source>
         <translation>Labot uzstādījumus</translation>
     </message>
     <message>
         <source>Configure accounts</source>
         <translation>Konfigurēt pieslēgumus</translation>
     </message>
     <message>
         <source>Mailbox</source>
         <translation>Pastkaste</translation>
     </message>
     <message>
         <source>Subject</source>
         <translation>Temats</translation>
     </message>
     <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>
         <translation>intreškopu saraksts</translation>
     </message>
     <message>
         <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.
 Tad nospiediet &quot;saņemt grupu sarakstu&quot; atkal un tiks parādītas
 tikai grupas kas sākās ar šo rindu.</translation>
     </message>
 </context>
 <context>
     <name>NNTPconfigUI</name>
     <message>
         <source>Configure NNTP</source>
         <translation>Konfigurēt NNTP</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Ports</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Pieslēguma vārds</translation>
     </message>
     <message>
         <source>Account</source>
         <translation>Pieslēgums</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Serveris</translation>
     </message>
     <message>
         <source>Use SSL</source>
         <translation>Lietot SSL</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Lietotājs</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Parole</translation>
     </message>
     <message>
         <source>Use Login</source>
         <translation>Pielietot lietotājvārdu</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Kopas</translation>
     </message>
     <message>
         <source>Newsgroup</source>
         <translation>Intreškopa</translation>
     </message>
     <message>
         <source>Get newsgroup list from server</source>
         <translation>Saņemt intreškopu sarakstu no servera</translation>
     </message>
 </context>
 <context>
     <name>Newmdirdlgui</name>
     <message>
         <source>Enter directory name</source>
         <translation>Ievadiet direktorija vārdu</translation>
     </message>
     <message>
         <source>Directory name:</source>
         <translation>Direktorija vārds:</translation>
     </message>
     <message>
         <source>Directory contains other subdirs</source>
         <translation>Direktorija satur citus apakšdirektorijus</translation>
     </message>
 </context>
 <context>
     <name>OpieMail</name>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
         <source>Mail queue flushed</source>
         <translation>Pasta rinda iztukšota</translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation>Dzēst Pastu</translation>
     </message>
     <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>Read this mail</source>
         <translation>Lasīt šo pastu</translation>
     </message>
     <message>
         <source>Delete this mail</source>
         <translation>Dzēst šo pastu</translation>
     </message>
     <message>
         <source>Copy/Move this mail</source>
         <translation>Kopēt/Pārvietot šo pastu</translation>
     </message>
     <message>
         <source>Error creating new Folder</source>
         <translation>Kļūda veidojot jaunu Mapi</translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation>&lt;center&gt;Kļūda veidojot &lt;br&gt;jaunu mapi - pārtraucu.&lt;/center&gt;</translation>
     </message>
     <message>
         <source>Define a smtp account first</source>
         <translation>Vispirms jādefinē smtp </translation>
     </message>
     <message>
         <source>Read this posting</source>
         <translation>Izlasiet šo apziņojumu</translation>
     </message>
     <message>
         <source>Edit this mail</source>
         <translation>Labot šo pastu</translation>
     </message>
 </context>
 <context>
     <name>POP3configUI</name>
     <message>
         <source>Configure POP3</source>
         <translation>Konfigurēt POP3</translation>
     </message>
     <message>
         <source>Account</source>
         <translation>Pieslēgums</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Pieslēguma Nosaukums</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Serveris</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Ports</translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation>Lietot secure sockets:</translation>
     </message>
     <message>
         <source>ssh $SERVER exec imapd</source>
         <translation></translation>
     </message>
     <message>
         <source>User</source>
         <translation>Lietotājs</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Parole</translation>
     </message>
     <message>
         <source>ask before downloading large mails</source>
         <translation>jautāt pirms lielu E-pastu lejuplādes</translation>
     </message>
     <message>
         <source>Large mail size (kb):</source>
         <translation>Liela pasta izmērs (kb):</translation>
     </message>
     <message>
         <source> kB</source>
         <translation>kB</translation>
     </message>
 </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>
         <source>Password</source>
         <translation>Parole</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Ports</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Serveris</translation>
     </message>
     <message>
         <source>Port of the SMTP Server</source>
         <translation>SMTP servera ports</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Lietotājs</translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation>Lietot secure sockets:</translation>
     </message>
     <message>
         <source>ssh $SERVER exec</source>
         <translation></translation>
     </message>
 </context>
 <context>
     <name>SelectMailTypeUI</name>
     <message>
         <source>Select Type</source>
         <translation>Izvēlēties Tipu</translation>
     </message>
     <message>
         <source>Select Account Type</source>
         <translation>Izvēlēties Pieslēguma Tipu</translation>
     </message>
     <message>
         <source>IMAP</source>
         <translation>IMAP</translation>
     </message>
     <message>
         <source>POP3</source>
         <translation>POP3</translation>
     </message>
     <message>
         <source>SMTP</source>
         <translation>SMTP</translation>
     </message>
 </context>
 <context>
     <name>SettingsDialogUI</name>
     <message>
         <source>Settings Dialog</source>
         <translation>Uzstādījumu Dialogs</translation>
     </message>
     <message>
         <source>View Mail</source>
         <translation>Skatīt Pastu</translation>
     </message>
     <message>
         <source>View mail as Html</source>
         <translation>Skatīt pastu kā Html</translation>
     </message>
     <message>
         <source>Compose Mail</source>
         <translation>Veidot Pastu</translation>
     </message>
     <message>
         <source>Send mails later ( enqueue in outbox )</source>
         <translation>Sūtīt pastu vēlāk (ievietot izejošajos)</translation>
     </message>
     <message>
         <source>Taskbar Applet</source>
         <translation>Uzdevumu Aplets</translation>
     </message>
     <message>
         <source>Disable Taskbar Applet</source>
         <translation>Atslēgt Uzdevumu Apletu</translation>
     </message>
     <message>
         <source> min</source>
         <translation>min</translation>
     </message>
     <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>
     <message>
         <source>From</source>
         <translation>No</translation>
     </message>
     <message>
         <source>To</source>
         <translation>Kam</translation>
     </message>
     <message>
         <source>Cc</source>
         <translation>Cc</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datums</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Kļūda</translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot reply yet.</source>
         <translation>&lt;p&gt;Vēstules saturs nav vēl atlādēts, tamdēļ nav iespējams sagatavot atbildi.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Labi</translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot forward yet.</source>
         <translation>&lt;p&gt;Vēstules saturs nav vēl atlādēts, tamdēļ nav iespējams pārsūtīt vēstuli.</translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation>Dzēst Pastu</translation>
     </message>
     <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>
         <source>Attachments</source>
         <translation>Pievienojumi</translation>
     </message>
     <message>
         <source>Show Html</source>
         <translation>Rādīt Html</translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation>Dzēst Pastu</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Apraksts</translation>
     </message>
     <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>
         <translation>Iezīmējat mērķa kasti</translation>
     </message>
     <message>
         <source>&lt;b&gt;Store mail(s) to&lt;/b&gt;</source>
         <translation>&lt;b&gt;Saglabāt pastu uz&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Folder:</source>
         <translation>Mape:</translation>
     </message>
     <message>
         <source>Account:</source>
         <translation>Pieslēgums:</translation>
     </message>
     <message>
         <source>Create new folder</source>
         <translation>Veidot jaunu folderi</translation>
     </message>
     <message>
         <source>Prefix will prepend, no need to enter it!</source>
         <translation>Prefiks tiks pievienots, nav nepieciešams to ievadīt!</translation>
     </message>
     <message>
         <source>Move mail(s)</source>
         <translation>Pārvietot pastu</translation>
     </message>
 </context>
 </TS>
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
@@ -1,172 +1,154 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HelpWindow</name>
     <message>
         <source>Backward</source>
         <translation>Atpakaļ</translation>
     </message>
     <message>
         <source>Forward</source>
         <translation>Uz priekšu</translation>
     </message>
 </context>
 <context>
     <name>QtRec</name>
     <message>
         <source>OpieRecord </source>
         <translation>OpieIeraksts</translation>
     </message>
     <message>
         <source>Play</source>
         <translation>Spēlēt</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Dzēst</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nosaukums</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Laiks</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>Faili</translation>
     </message>
     <message>
         <source>Sample Rate</source>
         <translation>Ieraksta Kvalitāte</translation>
     </message>
     <message>
         <source>Limit Size</source>
         <translation>Izmēra Ierobežojums</translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation>Neierobežots</translation>
     </message>
     <message>
         <source>File Directory</source>
         <translation>Faila Direktorijs</translation>
     </message>
     <message>
         <source>Bit Depth</source>
         <translation>Bitu Dziļums</translation>
     </message>
     <message>
         <source>Wave Compression (smaller files)</source>
         <translation>Wave Kompresija (mazākiem failiem)</translation>
     </message>
     <message>
         <source>Auto Mute</source>
         <translation>Auto Mute</translation>
     </message>
     <message>
         <source>In</source>
         <translation>Ieeja</translation>
     </message>
     <message>
         <source>Out</source>
         <translation>Izeja</translation>
     </message>
     <message>
         <source>mute</source>
         <translation>mute</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opcijas</translation>
     </message>
     <message>
         <source>Volume</source>
         <translation>Skaļums</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <source>Rename</source>
         <translation>Pārsaukt</translation>
     </message>
     <message>
         <source>Ir Beam out</source>
         <translation>Ir Bīmot</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>Ir nosūtīts.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Labi</translation>
     </message>
     <message>
         <source>Del</source>
         <translation>Dzēst</translation>
     </message>
     <message>
         <source>Stereo</source>
         <translation>Stereo</translation>
     </message>
     <message>
         <source>Please select file to play</source>
         <translation>Lūdzu izvēlaties failu spēlēšanai</translation>
     </message>
 </context>
 </TS>
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
@@ -1,151 +1,131 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>OSearch</source>
         <translation>OMeklēt</translation>
     </message>
     <message>
         <source>The details of the current result</source>
         <translation>Tekošo rezultātu detaļas</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Aplikācijas</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Dokumenti</translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation>Darbi</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Kalendārs</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Adreses</translation>
     </message>
     <message>
         <source>Search</source>
         <translation>Meklēt</translation>
     </message>
     <message>
         <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>
         <source></source>
         <translation></translation>
     </message>
     <message>
         <source>Case sensitive</source>
         <translation>Reģistrjūtīgs</translation>
     </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>
         <source>open in filemanager</source>
         <translation>atvērt failu menedžerī</translation>
     </message>
     <message>
         <source>File: </source>
         <translation>Fails:</translation>
     </message>
     <message>
         <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>
         <source>Search in dates</source>
         <translation>Meklēt datumos</translation>
     </message>
     <message>
         <source>Search content</source>
         <translation>Meklēt saturu</translation>
     </message>
 </context>
 </TS>
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
@@ -1,422 +1,418 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation>Valoda</translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation>DokumentuTabs</translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation>Datums un Laiks</translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation>Personas Informācija</translation>
     </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation>Aplikācijas Problēma</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation>&lt;p&gt;%1 neatbild.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Vai vēlaties apstādināt aplikāciju piespiedu kārtā?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;p&gt;Šai aplikācijai ir liegta ātrā ielāde.  Nospiediet un pieturiet aplikācijas ikonu, lai to atļautu.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; tika pārtraukts ar signāla kodu %2&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation>Aplikācija pārtraukta</translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation>Aplikācija nav atrasta</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Nevaru atrast aplikāciju &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Kļūda</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Nevaru atrast aplikāciju %1&lt;/qt&gt;</translation>
     </message>
     <message>
         <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>
 <context>
     <name>FirstUse</name>
     <message>
         <source>&lt;&lt; Back</source>
         <translation>&lt;&lt; Atpakaļ</translation>
     </message>
     <message>
         <source>Next &gt;&gt;</source>
         <translation>Nākamais &gt;&gt;</translation>
     </message>
     <message>
         <source>Tap anywhere on the screen to continue.</source>
         <translation>Nospiediet uz ekrāna lai sāktu.</translation>
     </message>
     <message>
         <source>Please wait, loading %1 settings.</source>
         <translation>Lūdzu uzgaidiet, ielādēju %1 uzstādījumus.</translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation>Lūdzu uzgaidiet...</translation>
     </message>
     <message>
         <source>Finish</source>
         <translation>Pabeigt</translation>
     </message>
 </context>
 <context>
     <name>InputMethods</name>
     <message>
         <source>Unicode</source>
         <translation>Unikods</translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation>Palaidējs</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Dokumenti</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation>- Palaidējs</translation>
     </message>
     <message>
         <source>No application</source>
         <translation>Nav aplikācijas</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;Šim dokumentam nav definētas aplikācijas.&lt;p&gt;Tips ir %1.</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Labi</translation>
     </message>
     <message>
         <source>View as text</source>
         <translation>Skatīt kā tekstu</translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation>&lt;b&gt;Meklēju Dokumentus...&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;Dokumentu Tab&lt;p&gt;ir aizliegts.&lt;p&gt;Lai to atjaunotu izmantojiet Uzstādījumi-&gt;Palaidējs&gt;DokumentuTabs&lt;/b&gt;&lt;/center&gt;</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation>Ikonu Skats</translation>
     </message>
     <message>
         <source>List View</source>
         <translation>Saraksta Skats</translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>All types</source>
         <translation>Visi tipi</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Dokumentu Skats</translation>
     </message>
 </context>
 <context>
     <name>Mediadlg</name>
     <message>
         <source>A new storage media detected:</source>
         <translation>Atrasts jauns krātuves veids:</translation>
     </message>
     <message>
         <source>What should I do with it?</source>
         <translation>Ko lai ar to dara?</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>Konfigurēt šo mediju. Izmaiņas tiks ņemtas vērā kad aplikāciju aizvērs.  Lai atjaunotu Dokumentu Tab jums vajag izņemt un ievietot šo mediju.</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation>Kurus mediju failus</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Visus</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Attēlu</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Tekstu</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation>Ierobežot meklēšanu:</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Pievienot</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Izņemt</translation>
     </message>
     <message>
         <source>Scan whole media</source>
         <translation>Skanēt visu nesēju</translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation>Vienmēr pārbaudīt šo nesēju</translation>
     </message>
 </context>
 <context>
     <name>QueuedRequestRunner</name>
     <message>
         <source>Processing Queued Requests</source>
         <translation>Apstrādājam Pieprasījumus Rindā</translation>
     </message>
 </context>
 <context>
     <name>SafeMode</name>
     <message>
         <source>Safe Mode</source>
         <translation>Drošais Režīms</translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation>Spraudņu Menedžeris...</translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation>Pārlaist Qtopia</translation>
     </message>
     <message>
         <source>Help...</source>
         <translation>Palīdzība...</translation>
     </message>
 </context>
 <context>
     <name>Server</name>
     <message>
         <source>USB Lock</source>
         <translation>USB Slēdzis</translation>
     </message>
 </context>
 <context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation>Informācija</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;Sistēmas datums šķiet nav pareizs.
 (%1)&lt;/p&gt;&lt;p&gt;Vai vēlaties mainīt pulksteņa uzstādījumus ?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>WARNING</source>
         <translation>UZMANĪBU</translation>
     </message>
     <message>
         <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
         <translation>&lt;p&gt;Bateriju līmenis ir kritisks!&lt;p&gt;Izslēdziet līdz uzlādei</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Labi</translation>
     </message>
     <message>
         <source>The battery is running very low. </source>
         <translation>Baterija paliek tukša.</translation>
     </message>
     <message>
         <source>&lt;p&gt;The Back-up battery is very low&lt;p&gt;Please charge the back-up battery</source>
         <translation>&lt;p&gt;Rezerves baterija ir tukša&lt;p&gt;Lūdzu uzlādējiet papildus bateriju</translation>
     </message>
     <message>
         <source>business card</source>
         <translation>vizītkarte</translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation>Drošais Režīms</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;Sistēmas starts neizdevās, un sistēma ir Drošā Režīmā. Šajā režīmā nav ielādēti spraudņi.  Jūs variet lietot Spraudņu Menedžeri lai izslēgtu spraudņus, kas radīja problēmas.</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Labi</translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation>Spraudņu Menedžeris...</translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation>Atmiņas Statuss</translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation>Trūkst Atmiņas
 Lūdzu saglabājiet datus.</translation>
     </message>
     <message>
         <source>Critical Memory Shortage
 Please end this application
 immediately.</source>
         <translation>Kritiski Trūkst Atmiņas
 Lūdzu tūlīt
 apstādiniet aplikāciju.</translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Shutdown...</source>
         <translation>Aizveras...</translation>
     </message>
     <message>
         <source>Terminate</source>
         <translation>Pārtraukt</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation>Pārtraukt Opie</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation>Pārstartēt</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation>Pārstartēt Opie</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation>Aizvērt</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Atlikt</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation>Sinh. Savienojumu</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;Neautorizēta sistēma pieprasa pieeju šai iekārtai.&lt;p&gt;Ja jūs lietojat Qtopia Desktop versiju vecāku par 1.5.1, lūdzu atjauniniet vai mainiet drošības uzstādījumus uz IntelliSync.</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation>Azliegt</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;Nezināma sistēma pieprasa pieeju šai iekārtai.&lt;p&gt;Ja jūs tiko sākāt sihnronizāciju, tas ir normāli.</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation>Atļaut</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;Neautorizēta sistēma pieprasa pieeju šai iekārtai.&lt;p&gt;Izvēloties IntelliSync lai varētu atļaut vai aizliegt pieeju.&lt;/qt&gt;</translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Abort</source>
         <translation>Atlikt</translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation>Sinhronizē:</translation>
     </message>
 </context>
 </TS>
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
@@ -1,286 +1,266 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoginBase</name>
     <message>
         <source>LoginBase</source>
         <translation>PieslēgumaBāze</translation>
     </message>
     <message>
         <source>Login</source>
         <translation>Pieslēgums</translation>
     </message>
     <message>
         <source>Login Automatically</source>
         <translation>Pieslēgties Automātiski</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>Ja jūs izvēlēsaties šo opciju, opie-logon automāŧiski pieslēgs jūs ar izvēlēto lietotāju.  
 
 Zaurus 5x00 tas vienmēr ir &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>Šis combo saraksts atļauj jums izvēlēties auto pieslēgumu
 (ja tas atļauts augstāk)  
 
 Jūs varat izvēlēties konfigurētu lietotāju.</translation>
     </message>
 </context>
 <context>
     <name>MultiauthConfig</name>
     <message>
         <source>Security configuration</source>
         <translation>Drošības konfigurācija</translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>Kurus spraudņus un kādā kārtībā:</translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the order they will appear in</source>
         <translation>Atzīmējiet ar ķeksi lai aktivizētu/deaktivizētu spraudni vai lietojiet bultiņas, lai izmainītu to parādīšanas kārtību</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>Uz augšu</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>Uz Leju</translation>
     </message>
     <message>
         <source>plugins</source>
         <translation>spraudņi</translation>
     </message>
     <message>
         <source>Authentication</source>
         <translation>Autentifikācija</translation>
     </message>
     <message>
         <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>
         <source>Locking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></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-securityplugin-*&lt;/em&gt; package! Once you have done that, you will be able to configure your PDA protection here.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MultiauthGeneralConfig</name>
     <message>
         <source>When to lock Opie</source>
         <translation>Kad noslēgt Opie</translation>
     </message>
     <message>
         <source>on Opie start</source>
         <translation>pie Opie startēšanas</translation>
     </message>
     <message>
         <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>
         <source>Attention</source>
         <translation type="unfinished">Uzmanību</translation>
     </message>
     <message>
         <source>You must save your current settings before trying to authenticate. Press OK to accept and launch a simulated authentication process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you don&apos;t like the result of this test, don&apos;t forget to change your settings before you exit the configuration application!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished">Atlikt</translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></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>Akceptēt sync no tīkla:</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>Izvēlaties tīkla diapazonu vai ievadiet jaunu.  
 
 Šis kombo lists ļauj jums izvēlēties diapazonu kuram tiks atļauta pieslēgšanās  
 
 Piemēram, diapazons 192.168.1.0/24 atļaus sinhronizēties datoriem ar IP starp 192.168.1.1. un 192.168.1.254  
 
 Ieraksts &quot;Visi&quot; ļaus pieslēgties *jebkuram*.
 Ieraksts &quot;Neviens&quot; *aizliegs* pieslēgumu visiem.  
 
 Ja nēsiet pārliecināti, izvēlaties &quot;Visi&quot;. </translation>
     </message>
     <message>
         <source>Delete Entry</source>
         <translation>Dzēst Ierakstu</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>Dzēst izvēlēto diapazonu no saraksta
 
 Ja jūs nospiedīsiet šo pogu, iezīmētais diapazons tiks dzēsts no saraksta.
 
 Ja jus nospiedāt šo pogu kļūdas pēc, jūs variet atjaunot noklusētos
 uzstādījumus ar pogu &quot;Atjaunot Noklusētos&quot;.</translation>
     </message>
     <message>
         <source>Restore Defaults</source>
         <translation>Ataunot Noklusētos</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>Šī poga atjaunos diapazonus
 uz noklusētajiem
 
 Uzmanību! Visi ar roku ievadītie diapazoni tiks dzēsti!</translation>
     </message>
     <message>
         <source>Select your sync software</source>
         <translation>Izvēlaties sinhronizēšanas programatūru</translation>
     </message>
     <message>
         <source>Qtopia 1.7</source>
         <translation></translation>
     </message>
     <message>
         <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 type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,370 +1,366 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation>Šī sadaļa rāda pieejamos testus, veiktajiem testiem tiek parādīts arī rezultāts, un salīdzinājums ar kādu izvēlētu iekārtu.  Lietojiet izvēles rūtiņas lai definētu kurus testus jūs vēlaties izpildīt.</translation>
     </message>
     <message>
         <source>Tests</source>
         <translation>Testi</translation>
     </message>
     <message>
         <source>Results</source>
         <translation>Rezultāti</translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation>Salīdzinājums</translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation>1. Veselo Skaitļu Aritmētika</translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation>2. Peldošā Komata Vienība</translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation>3. Teksta Renderēšana</translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation>4. Gfx Renderēšana</translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation>5. RAM Veiktspēja</translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation>6. SD Kartes Veiktspēja</translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation>4. CF Kartes Veiktspēja</translation>
     </message>
     <message>
         <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>
         <translation>Šis grafs rāda cik daudz atmiņas ir izlietots šajā Compact Flash atmiņas kartē.</translation>
     </message>
     <message>
         <source>Ha</source>
         <translation>C</translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation>Šis grafs rāda cik daudz vietas ir aizņemts uz cietā diska.</translation>
     </message>
     <message>
         <source>SD</source>
         <translation>SD</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation>Šis grafs rāda cik daudz vietas ir aizņemts uz Secure Digital atmiņas kartes.</translation>
     </message>
     <message>
         <source>SC</source>
         <translation>SC</translation>
     </message>
     <message>
         <source>In</source>
         <translation>Ie</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>Šis grafs rāda cik daudz atmiņas ir aizņemts uz šī handheld iebūvētās atmiņas (piem. Flash atmiņa).</translation>
     </message>
     <message>
         <source>RA</source>
         <translation>RA</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation>Šis grafs norāda cik daudz atmiņas tiek patreiz lietots pagaidu RAM diskā.</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Aplikācijas CPU lietojums (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>Sistēmas CPU lietojums (%)</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Šī lapa rāda cik daudz tiek izmantots iekārtas procesors.</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Tips:</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation>Šī lapa rāda atmiņas (piem. RAM) izlietojumu šajā iekārtā.
 Atmiņas ir kategorizētas sekojoši:
 
 1. Izmantots - atmiņu izmanto Opie un jebkura strādājoša aplikācija.
 2. Buferi - pagaidu datu glabātuve kas tiek lietota lai uzlabotu veiktspēju.
 3. Kešots - informācija, kas nesen lietota un nav vēl atbrīvota.
 4. Brīvs - atmiņa kuru patreiz neizmanto Opie vai aplikācijas.</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Kopā Atmiņa: %1 kB</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Izmantots (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Buferi (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Kešs (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Brīvs (%1 kB)</translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation>Kopā Swap: %1 kB</translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Modulis</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Izmērs</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Lieto#</translation>
     </message>
     <message>
         <source>Used by</source>
         <translation>Izmanto</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>Šis ir saraksts ar visiem šajā handheld iekārtā ielādētajiem kerneļa moduļiem.
 
 Klikšķiniet un pieturiet uz moduļa, lai redzētu papildus informāciju par moduli, vai arī to izlādētu.</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>Izvēlaties šeit komandu un klikšķiniet Nosūtīt pogu pa labi, lai aizsūtītu zemāk izvēlētam modulim komandu.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Sūtīt</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Klikšķiniet šeit, lai aizsūtītu iezīmēto komandu zemāk norādītam modulim.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Šis lauks rāda papildus informāciju par šo moduli.</translation>
     </message>
     <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation>
 Vai tiešām vēlaties palaist
 %1 šim modulim?</translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source> : %1 kB</source>
         <translation>: %1 kB</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Izmantots (1% kB)</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>Pieejams (%1 kB)</translation>
     </message>
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Komanda</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Statuss</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Laiks</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation>Šis ir visu handheld iekārtas procesu saraksts.
 
 Klikšķiniet un turiet uz procesa, lai redzētu papildus informāciju par to, vai sūtītu tam signālu.</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation>Izvēlaties signālu un klikšķiniet Sūtīt pogu pa labi, lai nosūtītu signālu šim procesam.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Sūtīt</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation>Klikšķiniet šeit lai nosūtītu iezīmēto signālu šim procesam.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>Šis lauks rāda pildu informāciju par šo procesu.</translation>
     </message>
     <message>
         <source>Really want to send %1
 to this process?</source>
         <translation>Tiešām nosūtīt %1
 šim procesam?</translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>Sistēmas Info</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Atmiņa</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Glabātuve</translation>
     </message>
     <message>
         <source>CPU</source>
         <translation>CPU</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Process</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>Moduļi</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Versija</translation>
     </message>
     <message>
         <source>Benchmark</source>
         <translation>Veiktspējas vērtējums</translation>
     </message>
     <message>
         <source>Syslog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Linux Kernelis&lt;/b&gt;&lt;p&gt;Versija:</translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Kompilējis:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Versija:</translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Būvēts uz:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>&lt;p&gt;Versija:</translation>
     </message>
     <message>
         <source>&lt;br&gt;Model: </source>
         <translation>&lt;br&gt;Modelis:</translation>
     </message>
     <message>
         <source>&lt;br&gt;Vendor: </source>
         <translation>&lt;br&gt;Ražotājs:</translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation>Šī lapa rāda Opie, Linux kerneļa un distribūcijas tekošās versijas.</translation>
     </message>
     <message>
         <source>Built against Qt/E </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,69 +1,58 @@
 <!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>
     <message>
         <source>TableViewer - Edit Keys</source>
         <translation>TabuluSkatītājs - Labot Atslēgas</translation>
     </message>
     <message>
         <source>Key Name</source>
         <translation>Atslēgas Vārds</translation>
     </message>
     <message>
         <source>Key Type</source>
         <translation>Atslēgas Tips</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Jauns</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Dzēst</translation>
     </message>
     <message>
         <source>Clear All</source>
         <translation>Attīrīt Visu</translation>
     </message>
 </context>
 <context>
     <name>TVListView</name>
     <message>
         <source>List View</source>
         <translation>Saraksta Skats</translation>
     </message>
 </context>
 <context>
     <name>TableViewerWindow</name>
     <message>
         <source>Table Viewer</source>
         <translation>Tabulu Skatītājs</translation>
     </message>
     <message>
         <source>could not load Document</source>
         <translation>nevaru ielādēt Dokumentu</translation>
     </message>
 </context>
 </TS>
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
@@ -1,146 +1,142 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <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>
         <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;Spraudnis &quot;%1&quot; izsauca Šodien nojukšanu.  Varētu būt kad spraudnis nav pareizi instalēts.&lt;br&gt;Šodien turpinās ielādēt spraudņus.&lt;/qt&gt;</translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation>Šodien</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
         <translation>Šodien - Maximilian Reiß</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>Klikšķiniet šeit lai iegūtu konfigurēšanas dialogu</translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Today Config</source>
         <translation>Šodien Konfigurācija</translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>Kādā kārtībā ielādēt kādus spraudņus:</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>Klikšķiniet uz izvēles rūtiņas lai aktivizētu/deaktivizētu spraudni vai arī lietojiet bultiņas lai mainītu attēlošanas kārtību</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>Pārvietot uz Augšu</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>Pārvietot uz Leju</translation>
     </message>
     <message>
         <source>active/order</source>
         <translation>aktīvs/kārtība</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Dažādi</translation>
     </message>
 </context>
 <context>
     <name>TodayConfigMiscBase</name>
     <message>
         <source>Form1</source>
         <translation>Forma1</translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
         <translation>Atķeksējiet šo ja vēlaties lai šodien tiktu parādīts pēc ieslēgšanas.</translation>
     </message>
     <message>
         <source>autostart on resume?</source>
         <translation>autorstartēt pēc atjaunošanas?</translation>
     </message>
     <message>
         <source>tiny banner</source>
         <translation>sīkais baneris</translation>
     </message>
     <message>
         <source>Have small banner </source>
         <translation>Būs mazs baneris</translation>
     </message>
     <message>
         <source> min</source>
         <translation>min</translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
         <translation>Cik minūtes PDA jābūt iemigušam pirms autostartēšanas iespēja iedarbojas pie atjaunošanas</translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation>neaktivitātes minūtes</translation>
     </message>
     <message>
         <source> pixel</source>
         <translation>pikseļi</translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
         <translation>Uzstādīt ikonas izmēru pikseļos</translation>
     </message>
     <message>
         <source>icon size</source>
         <translation>ikonas izmērs</translation>
     </message>
     <message>
         <source> sec</source>
         <translation>sek</translation>
     </message>
     <message>
         <source>never</source>
         <translation>nekad</translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
         <translation>Cik bieži Šodien vajag sevi atjaunot</translation>
     </message>
     <message>
         <source>refresh</source>
         <translation>atjaunot</translation>
     </message>
 </context>
 </TS>
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
@@ -1,646 +1,566 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Ok</source>
         <translation>Labi</translation>
     </message>
     <message>
         <source>&lt;h1&gt;Alarm at %1&lt;/h1&gt;&lt;br&gt;</source>
         <translation>&lt;h1&gt;Brīdinājums uz %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">Neaizpildīts</translation>
     </message>
 </context>
 <context>
     <name>NewTaskDlg</name>
     <message>
         <source>New Task</source>
         <translation type="unfinished">Jauns Uzdevums</translation>
     </message>
     <message>
         <source>Blank task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Using template:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Task Editor</source>
         <translation>Uzdevumu Redaktors</translation>
     </message>
     <message>
         <source>Information</source>
         <translation>Informācija</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Statuss</translation>
     </message>
     <message>
         <source>Alarms</source>
         <translation>Brīdinājumi</translation>
     </message>
     <message>
         <source>Recurrence</source>
         <translation>Atkārtošanās</translation>
     </message>
 </context>
 <context>
     <name>Opie</name>
     <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
 Atbrīvojiet nedaudz vietas
 un pamēģiniet atkal.
 
 Vai Begit?</translation>
     </message>
     <message>
         <source>Todo</source>
         <translation>Uzdevumi</translation>
     </message>
     <message>
         <source>Data can not be edited, currently syncing</source>
         <translation>Datus nevar labot, patreiz notiek sinhronizācija</translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation>visi uzdevumi?</translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation>visi izpildītie uzdevumi?</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; pienākuši %1 jauni uzdevumi.&lt;p&gt;Vai vēlaties tos pievienot Darbu sarakstam?</translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation>Jaunie Uzdevumi</translation>
     </message>
     <message>
         <source>Data can&apos;t be edited, currently syncing</source>
         <translation>Datus nevar labot, patreiz notiek sinhronizācija</translation>
     </message>
     <message>
         <source>C.</source>
         <translation>C.</translation>
     </message>
     <message>
         <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>
         <source>Remove</source>
         <translation>Izņemt</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nosaukums</translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation>Jauna Sagatave %1</translation>
     </message>
     <message>
         <source>Click here to set the priority of new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Klikšķiniet šeit lai norādītu jaunā uzdevuma prioritāti.
 
 Šis lauks tiek saukts par ātro uzdevumjoslu.
 
 Tas ļauj jums ātri pievienot sarakstam jaunus uzdevumus.  Šo laukumu var parādīt vai paslēpt izvēloties Opcijas-&gt;&apos;Rādīt ātro uzdevumu joslu&apos; no izvēlnes zemāk.</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>Šeit ievadiet uzdevumu aprakstu.
 
 Šis lauks tiek saukts par ātro uzdevumjoslu.
 
 Tas ļauj jums ātri pievienot sarakstam jaunus uzdevumus.  Šo laukumu var parādīt vai paslēpt izvēloties Opcijas-&gt;&apos;Rādīt ātro uzdevumu joslu&apos; no izvēlnes zemāk.</translation>
     </message>
     <message>
         <source>More</source>
         <translation>Vairāk</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>Klikšķiniet šeit lai pievienotu uzdevuma papildus informāciju.
 
 Šis lauks tiek saukts par ātro uzdevumjoslu.
 
 Tas ļauj jums ātri pievienot sarakstam jaunus uzdevumus.  Šo laukumu var parādīt vai paslēpt izvēloties Opcijas-&gt;&apos;Rādīt ātro uzdevumu joslu&apos; no izvēlnes zemāk.</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Ievadīt</translation>
     </message>
     <message>
         <source>Click here to add new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Klikšķiniet lai pievienotu jaunu uzdevumu.
 
 Šis lauks tiek saukts par ātro uzdevumjoslu.
 
 Tas ļauj jums ātri pievienot sarakstam jaunus uzdevumus.  Šo laukumu var parādīt vai paslēpt izvēloties Opcijas-&gt;&apos;Rādīt ātro uzdevumu joslu&apos; no izvēlnes zemāk.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Atlikt</translation>
     </message>
     <message>
         <source>Click here to reset new task information.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Klikšķiniet šeit lai nomestu uzdevuma informāciju.
 
 Šis lauks tiek saukts par ātro uzdevumjoslu.
 
 Tas ļauj jums ātri pievienot sarakstam jaunus uzdevumus.  Šo laukumu var parādīt vai paslēpt izvēloties Opcijas-&gt;&apos;Rādīt ātro uzdevumu joslu&apos; no izvēlnes zemāk.</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Prioritāte:</translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>Table View</source>
         <translation>Tabulas Skats</translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation>%1 diena(s)</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nekas</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>Date</source>
         <translation>Datums</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Laiks</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Tips</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Jauns</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Labot</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Dzēst</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Summary:</source>
         <translation>Apkopojums:</translation>
     </message>
     <message>
         <source>Enter brief description of the task here.</source>
         <translation>Šeit ievadiet uzdevumu aprakstu.</translation>
     </message>
     <message>
         <source>Complete </source>
         <translation>Pabeigts</translation>
     </message>
     <message>
         <source>Work on </source>
         <translation>Strādā pie</translation>
     </message>
     <message>
         <source>Buy </source>
         <translation>No</translation>
     </message>
     <message>
         <source>Organize </source>
         <translation>Organizēt</translation>
     </message>
     <message>
         <source>Get </source>
         <translation>Saņemt</translation>
     </message>
     <message>
         <source>Update </source>
         <translation>Atjaunot</translation>
     </message>
     <message>
         <source>Create </source>
         <translation>Izveidot</translation>
     </message>
     <message>
         <source>Plan </source>
         <translation>Plāns</translation>
     </message>
     <message>
         <source>Call </source>
         <translation>Zvans</translation>
     </message>
     <message>
         <source>Mail </source>
         <translation>Pasts</translation>
     </message>
     <message>
         <source>Select priority of task here.</source>
         <translation>Šeit izvēlaties uzdevuma prioritāti.</translation>
     </message>
     <message>
         <source>Very High</source>
         <translation>Ļoti Augsta</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Augsta</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normāla</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Zema</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>Ļoti Zema</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorija:</translation>
     </message>
     <message>
         <source>Select category to organize this task with.</source>
         <translation>Izvēlaties uzdevuma organizācijas kategoriju.</translation>
     </message>
     <message>
         <source>Recurring task</source>
         <translation>Atkārtots uzdevums</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šķiniet šeit ja uzdevums atkārtojas regulāri.  Ja tas ir atzīmēts, frekvenci var uzstādīt Atkārtošanās tabā.</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Apraksts:</translation>
     </message>
     <message>
         <source>Enter any additional information about this task here.</source>
         <translation>Ievadiet papildus informāciju, ja nepieciešams.</translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation>Darbu Saraksts</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorStatus</name>
     <message>
         <source>Status:</source>
         <translation>Statuss:</translation>
     </message>
     <message>
         <source>Click here to set the current status of this task.</source>
         <translation>Klikšķiniet šeit, lai norādītu uzdevuma tekošo statusu.</translation>
     </message>
     <message>
         <source>Started</source>
         <translation>Sākts</translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation>Atlikts</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>Pabeigts</translation>
     </message>
     <message>
         <source>Not started</source>
         <translation>Nav sākts</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Progress:</translation>
     </message>
     <message>
         <source>Select progress made on this task here.</source>
         <translation>Šeit norādiet uzdevuma patreizējo progresu.</translation>
     </message>
     <message>
         <source>0 %</source>
         <translation></translation>
     </message>
     <message>
         <source>20 %</source>
         <translation></translation>
     </message>
     <message>
         <source>40 %</source>
         <translation></translation>
     </message>
     <message>
         <source>60 %</source>
         <translation></translation>
     </message>
     <message>
         <source>80 %</source>
         <translation></translation>
     </message>
     <message>
         <source>100 %</source>
         <translation></translation>
     </message>
     <message>
         <source>Start Date:</source>
         <translation>Sākuma Datums:</translation>
     </message>
     <message>
         <source>Click here to set the date this task was started.</source>
         <translation>Klikšķiniet šeit lai uzstādītu datumu iesāktam uzdevumam.</translation>
     </message>
     <message>
         <source>Due Date:</source>
         <translation>Līdz Datumam:</translation>
     </message>
     <message>
         <source>Click here to set the date this task needs to be completed by.</source>
         <translation>Klikšķiniet šeit, lai uzstādītu šī uzdevuma plānoto pabeigšanas datumu.</translation>
     </message>
     <message>
         <source>Completed:</source>
         <translation>Pabeigts:</translation>
     </message>
     <message>
         <source>Click here to mark this task as completed.</source>
         <translation>Klikšķiniet šeit, lai norādītu ka uzdevums ir pabeigts.</translation>
     </message>
     <message>
         <source>Click here to set the date this task was completed.</source>
         <translation>Klikšķiniet šeit lai uzstādītu uzdevuma pabeigšanas datumu.</translation>
     </message>
     <message>
         <source>Maintainer Mode:</source>
         <translation>Uzturētāja Režīms:</translation>
     </message>
     <message>
         <source>Click here to set the maintainer&apos;s role.</source>
         <translation>Noklikšķiniet šeit lai uzstādītu uzturētāja lomu.</translation>
     </message>
     <message>
         <source>Nothing</source>
         <translation>Nekas</translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation>Atbildīgs</translation>
     </message>
     <message>
         <source>Done By</source>
         <translation>Darba veicējs</translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation>Korrdinators</translation>
     </message>
     <message>
         <source>Maintainer:</source>
         <translation>Uzturētājs:</translation>
     </message>
     <message>
         <source>This is the name of the current task maintainer.</source>
         <translation>Šis ir tekošā uzdevuma uzturētājs.</translation>
     </message>
     <message>
         <source>test</source>
         <translation>test</translation>
     </message>
     <message>
         <source>Click here to select the task maintainer.</source>
         <translation>Klikšķiniet šeit lai izvēlētos uzdevuma uzturētāju.</translation>
     </message>
 </context>
 </TS>
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
@@ -1,643 +1,577 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorija</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Ikona</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Lauks 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Lauks 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Lauks 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Lauks 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Lauks 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Lauks 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Informācija:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Jauns Ieraksts</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Komentārs</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Lauks 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Lauks 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Parole</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Lietotāja vārds</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nosaukums</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSeifs</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Parole</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>FailuDlg</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>failu tipu filtrs</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation>ComboBox FailuTipuFiltra
 
 rediģē vai izvēlies filtru</translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation>apstiprina izvēli un aizver formu</translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation>OKPoga</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation>atliek izvēli un aizver formu</translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation>AtliktPoga</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation>rāda izvēlēto faila nosaukumu</translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation>Faila nosaukums LineEdit
 
 rāda iezīmēto failu
 un atļauj tiešu faila nosaukuma
 labošanu</translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation>ComboBox Direktorija
 labo vai atzīmē direktorija vārdu</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Vārds</translation>
     </message>
     <message>
         <source>size</source>
         <translation>izmērs</translation>
     </message>
     <message>
         <source>type</source>
         <translation>tips</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>direktoriju sarakstskats</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation>Direktorija SarakstaSkats
 
 rāda sarakstu ar direktorijiem un failiem</translation>
     </message>
     <message>
         <source></source>
         <translation></translation>
     </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation>dir</translation>
     </message>
     <message>
         <source>file</source>
         <translation>fails</translation>
     </message>
     <message>
         <source>link</source>
         <translation>saite</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Meklēt</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Lietotājvārds</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Vārds</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Komentārs</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <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>
         <source>&amp;Save document</source>
         <translation>&amp;Saglabāt dokumentu</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
         <translation>S&amp;aglabāt dokumentu ar jaunu Paroli</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
         <translation>&amp;Eksportēt teksta failu</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
         <translation>&amp;Importēt teksta failu</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
         <translation>&amp;Izņemt teksta failu</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
         <translation>&amp;Atvērt ierakstus izvērsti</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
         <translation>&amp;Iziet</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Fails</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Jauns</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Labot</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Dzēst</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Categorija</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Izgriezt</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopēt</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>I&amp;evietot</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Meklēt</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Ieraksts</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>Pa&amp;r</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Palīdzība</translation>
     </message>
     <message>
         <source>New entry</source>
         <translation>Jauns ieraksts</translation>
     </message>
     <message>
         <source>Edit category or entry</source>
         <translation>Labot ieraksta kategoriju</translation>
     </message>
     <message>
         <source>Delete category or entry</source>
         <translation>Dzēst ieraksta kategoriju</translation>
     </message>
     <message>
         <source>Find entry</source>
         <translation>Meklēt ierakstu</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Vārds</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Lauks 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Lauks 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Komentārs</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Lauks 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Lauks 5</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;Labi</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Visi</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Teksts</translation>
     </message>
     <message>
         <source>Remove text file</source>
         <translation>Izņemt teksta failu</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
         <translation>Nevaru izņemt teksta failu.</translation>
     </message>
     <message>
         <source>No document defined.
 You have to create a new document</source>
         <translation>Nav definēts dokuments.
 Jums jāizveido jauns dokuments</translation>
     </message>
     <message>
         <source>Export text file</source>
         <translation>Eksportēt teksta failu</translation>
     </message>
     <message>
         <source>Import text file</source>
         <translation>Importēt teksta failu</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
         <translation>Nevaru eksportēt uz teksta failu.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
         <translation>Nevaru importēt teksta failu.</translation>
     </message>
     <message>
         <source>Enter Password</source>
         <translation>Ievadiet Paroli</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
         <translation>Kļūdaina parole.
 
 ZSeifs beidz darbu.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
         <translation>Kļūdaina parole.
 Ievadīsiet vēlreiz?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Jā</translation>
     </message>
     <message>
         <source>&amp;No.</source>
         <translation>&amp;Nē.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
         <translation>Tukš dokuments vai
 kļūdaina parole.
 Turpināt?</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;Nē</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
         <translation>&amp;Jā.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
         <translation>Parole ir tukša.
 Lūdzu ievadiet to vēlreiz.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
         <translation>Atkārtojiet Paroles Ievadu</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
         <translation>Parolēm jābūt identiskām.
 Lūdzu ievadiet vēlreiz.</translation>
     </message>
     <message>
         <source>Do you want to save </source>
         <translation>Vai vēlaties saglabāt</translation>
     </message>
     <message>
         <source>
 before continuing?</source>
         <translation>
 pirms turpināšānas?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation>&amp;Saglabāt</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
         <translation>&amp;Nesaglabāt</translation>
     </message>
     <message>
         <source>Password file saved.</source>
         <translation>Paroles fails saglabāts.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
         <translation>Vai vēlaties saglabāt
 pirms iziešanas?</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
         <translation>S&amp;aglabāt ar
 jaunu
 paroli</translation>
     </message>
     <message>
         <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>
         <source>&lt;P&gt;You must create a new document first. Ok to create?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Password Manager&lt;br&gt;ZSafe version 2.1.2&lt;br&gt;&lt;/b&gt;by Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Translations by Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,577 +1,497 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation>Име и Презиме</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Контакт</translation>
     </message>
     <message>
         <source>Pick</source>
         <translation>Избор</translation>
     </message>
 </context>
 <context>
     <name>AbView</name>
     <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>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation>Избраната датотека
 не завешува со „.vcf“
 Дали сакате да ја отворите?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Да</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;Не</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>Додади контакт?</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <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>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Неможе да се сними информацијата.
 Ослободте простор
 и обидете се повторно
 
 Излегување?</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>
         <translation>Кликнете на јазиче за да изберете едно</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Општо</translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation>Подесувања за пребарување</translation>
     </message>
     <message>
         <source>Query Style</source>
         <translation>Стил на прашање</translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation>Подесувања за стилот на прашањето на пребарување</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>Користи регуларни изрази</translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation>Алатката за пребарување очекува регуларен израз доколку се избере</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>Користи специјални знаци (*,?)</translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
         <translation>Алатката за пребарување очекува само едноставни специјални знаци</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Внимавај на Големи и Мали букви</translation>
     </message>
     <message>
         <source>If selected, search differs between upper and lower chars</source>
         <translation>Доколку е изврано, пребарувањето ги разликува големите и малите букви</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Фонт</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Мал</translation>
     </message>
     <message>
         <source>Font size for list- and card view</source>
         <translation>Големина на фонт за листа - преглед на картички</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Нормален</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Голем</translation>
     </message>
     <message>
         <source>Tool-/Menubar</source>
         <translation>Алатки-/Мени палета</translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation>Фиксиран</translation>
     </message>
     <message>
         <source>Switch to fixed menu-/toolbars after restarting application !</source>
         <translation>Префрли се на фиксирано мени-/палети по рестартирање на апликацијата !</translation>
     </message>
     <message>
         <source>Moveable</source>
         <translation>Поместиливи</translation>
     </message>
     <message>
         <source>Switch to moveable menu-/toolbars after restarting application !</source>
         <translation>Префрли се на поместливо мени-/палети по рестартирање на апликацијата !</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Електронска Пошта</translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
         <translation>Подесувања на фонт за листа и преглед на картички</translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation>Преферирам QT-Mail</translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation>Користи ја апликацијата за електронска пошта на Sharp доколку е достапна</translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation>Преферирам Opie-Mail</translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</source>
         <translation>Користи OPIE апликација за електронска пошта ако е инсталирана</translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation>Забелешка: QT-Mail е 
 достапен само на  
 SHARP основниот ROM.
 Оpie-Mail е слободен !</translation>
     </message>
     <message>
         <source>Order</source>
         <translation>Подреди</translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation>Избери редослед на контакти:</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Нагоре</translation>
     </message>
     <message>
         <source>Move selected attribute one line up</source>
         <translation>Помести го избраниот атрибут еден ред погоре</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Надоле</translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation>Помести го избраниот атрибут еден ред подоле</translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation>Листа на сите достапни атрибути</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Додај</translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation>Додај го избраниот атрибут од долната на горната листа</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Отстрани</translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation>Отстрани го избраниот атрибут од горната листа</translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation>Подреди (горе -&gt; доле) го дефинира примарниот контакт прикажан во втората колона на прегледот по листа </translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Full Name...</source>
         <translation>Полно име...</translation>
     </message>
     <message>
         <source>Press to enter last- middle and firstname</source>
         <translation>Притиснете enter за да внесете презиме, средно име и име</translation>
     </message>
     <message>
         <source>Enter fullname directly ! If you have a lastname with multiple words ( for instance &quot;de la Guerra&quot;), please write &lt;lastname&gt;,&lt;firstnames&gt; like this: &quot;de la Guerra, Carlos Pedro&quot;</source>
         <translation>Внесете го целото име директно! Доколку имате презиме со повеќе зборови (на пр, Јакимовска Јосифовиќ), напишете &lt;презиме&gt;,&lt;име&gt; пр: Јакимовска Јосифовиќ, Слободанка</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Работно Место</translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation>Работно Место..</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Суфикс</translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation>Нешто како „јр.“..</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Организација</translation>
     </message>
     <message>
         <source>The working place of the contact</source>
         <translation>Работно место на контактот</translation>
     </message>
     <message>
         <source>Press to select attribute to change</source>
         <translation>Притисно ма атрибутот кој сакате да го измените</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Зачувај како</translation>
     </message>
     <message>
         <source>Press to select how to store the name (and howto show it in the listview)</source>
         <translation>Притиснете да изберете како да го зачувате името (и како да го прикажете во прегледот на листата)</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Категорија</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Забелешки...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Основни</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Бизнис</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Дома</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Адреса</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Град</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Република</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>Поштенски код</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>Држава</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>Соединети Држави</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Велика Британија</translation>
     </message>
     <message>
         <source>Afghanistan</source>
         <translation>Авганистан</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation>Албанија</translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation>Алгерија</translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation>Америчка Самоа</translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation>Андора</translation>
     </message>
     <message>
         <source>Angola</source>
         <translation>Ангола</translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation>Ангулија</translation>
     </message>
     <message>
         <source>Antarctica</source>
         <translation>Антартик</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>Аргентина</translation>
     </message>
     <message>
         <source>Armenia</source>
         <translation>Ерменија</translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation>Аруба</translation>
     </message>
     <message>
         <source>Australia</source>
         <translation>Аустралија</translation>
     </message>
     <message>
         <source>Austria</source>
         <translation>Австриа</translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation>Азејберџан</translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation>Бахами</translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation>Бахиран</translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation>Бангладеш</translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation>Барбадос</translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation>Беларус</translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation>Белгија</translation>
     </message>
     <message>
         <source>Belize</source>
         <translation>Белз</translation>
     </message>
     <message>
         <source>Benin</source>
         <translation>Бенин</translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation>Бермуди</translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation>Бхутан</translation>
     </message>
     <message>
         <source>Bolivia</source>
         <translation>Боливија</translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation>Боцвана</translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation>Боветски острови</translation>
     </message>
     <message>
@@ -1013,552 +933,385 @@ SHARP основниот ROM.
     <message>
         <source>Nepal</source>
         <translation>Непал</translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation>Холандија</translation>
     </message>
     <message>
         <source>New Caledonia</source>
         <translation>Нова Каледонија</translation>
     </message>
     <message>
         <source>New Zealand</source>
         <translation>Нов Зеланд</translation>
     </message>
     <message>
         <source>Nicaragua</source>
         <translation>Никарагва</translation>
     </message>
     <message>
         <source>Niger</source>
         <translation>Нигерија</translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation>Нигерија</translation>
     </message>
     <message>
         <source>Niue</source>
         <translation>Ниуе</translation>
     </message>
     <message>
         <source>Norway</source>
         <translation>Норвешка</translation>
     </message>
     <message>
         <source>Oman</source>
         <translation>Оман</translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation>Пакистан</translation>
     </message>
     <message>
         <source>Palau</source>
         <translation>Палау</translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
         <translation>Палестина</translation>
     </message>
     <message>
         <source>Panama</source>
         <translation>Панама</translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation>Папа Нова Гвинеја</translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation>Парагвај</translation>
     </message>
     <message>
         <source>Peru</source>
         <translation>Перу</translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation>Филипини</translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
         <translation>Острови Питчарин</translation>
     </message>
     <message>
         <source>Poland</source>
         <translation>Полска</translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation>Португалија</translation>
     </message>
     <message>
         <source>Puerto Rico</source>
         <translation>Пуерто Рико</translation>
     </message>
     <message>
         <source>Qatar</source>
         <translation>Кватар</translation>
     </message>
     <message>
         <source>Reunion</source>
         <translation>Рејунион</translation>
     </message>
     <message>
         <source>Romania</source>
         <translation>Романија</translation>
     </message>
     <message>
         <source>Russia</source>
         <translation>Русија</translation>
     </message>
     <message>
         <source>Rwanda</source>
         <translation>Рованда</translation>
     </message>
     <message>
         <source>Saint Lucia</source>
         <translation>Сент Луција</translation>
     </message>
     <message>
         <source>Samoa</source>
         <translation>Самоа</translation>
     </message>
     <message>
         <source>San Marino</source>
         <translation>Сан Марино</translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
         <translation>Саудиска Арабија</translation>
     </message>
     <message>
         <source>Senegal</source>
         <translation>Сенегал</translation>
     </message>
     <message>
         <source>Seychelles</source>
         <translation>Сејчелс</translation>
     </message>
     <message>
         <source>Sierra Leone</source>
         <translation>Сиера Леоне</translation>
     </message>
     <message>
         <source>Singapore</source>
         <translation>Сингапур</translation>
     </message>
     <message>
         <source>Slovakia</source>
         <translation>Словачка</translation>
     </message>
     <message>
         <source>Slovenia</source>
         <translation>Словениа</translation>
     </message>
     <message>
         <source>Solomon Islands</source>
         <translation>Соломонски Острови</translation>
     </message>
     <message>
         <source>Somalia</source>
         <translation>Сомалија</translation>
     </message>
     <message>
         <source>South Africa</source>
         <translation>Јужна Африка</translation>
     </message>
     <message>
         <source>Spain</source>
         <translation>Шпанија</translation>
     </message>
     <message>
         <source>Sri Lanka</source>
         <translation>Шри Ланка</translation>
     </message>
     <message>
         <source>St. Helena</source>
         <translation>Св. Хелена</translation>
     </message>
     <message>
         <source>Sudan</source>
         <translation>Судан</translation>
     </message>
     <message>
         <source>Suriname</source>
         <translation>Суринам</translation>
     </message>
     <message>
         <source>Swaziland</source>
         <translation>Свазиланд</translation>
     </message>
     <message>
         <source>Sweden</source>
         <translation>Шведска</translation>
     </message>
     <message>
         <source>Switzerland</source>
         <translation>Швајцарија</translation>
     </message>
     <message>
         <source>Taiwan</source>
         <translation>Тајван</translation>
     </message>
     <message>
         <source>Tajikistan</source>
         <translation>Таџекистан</translation>
     </message>
     <message>
         <source>Tanzania</source>
         <translation>Танзанија</translation>
     </message>
     <message>
         <source>Thailand</source>
         <translation>Тајланд</translation>
     </message>
     <message>
         <source>Togo</source>
         <translation>Того</translation>
     </message>
     <message>
         <source>Tokelau</source>
         <translation>Токелау</translation>
     </message>
     <message>
         <source>Tonga</source>
         <translation>Тонга</translation>
     </message>
     <message>
         <source>Tunisia</source>
         <translation>Тунезија</translation>
     </message>
     <message>
         <source>Turkey</source>
         <translation>Турција</translation>
     </message>
     <message>
         <source>Turkmenistan</source>
         <translation>Туркменистан</translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation>Тувалу</translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation>Уганда</translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation>Украина</translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation>Уругвај</translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation>Узбекистан</translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation>Вануту</translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation>Венецуела</translation>
     </message>
     <message>
         <source>Vietnam</source>
         <translation>Виетнам</translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation>Девствени Острови</translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation>Западна Сахара</translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation>Јемен</translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation>Југославија</translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation>Замбија</translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation>Зимбабве</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Роденден</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Избриши</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Годишнина</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Пол</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Машки</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Женски</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Детаљи</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>Внеси Забелешка</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>Уреди Име</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Име</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>средно име</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Презиме</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Контакти</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie</name>
     <message>
         <source>Contact</source>
         <translation type="unfinished">Контакт</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation type="unfinished">Контакти</translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation type="unfinished">Започни Пребарување</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation type="unfinished">Напиши е-порака до</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation type="unfinished">Вметни вКаричка</translation>
     </message>
     <message>
         <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,448 +1,358 @@
 <!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>
         <source>Open as text</source>
         <translation>Отвори како текст</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Акции</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>Креирај Директориум</translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation>Мреирај Симболичка врска</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Преименувај</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Копирај</translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation>Копирај како</translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation>Копирај ист директориум</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>Премести</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Избриши</translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation>Додај во документи</translation>
     </message>
     <message>
         <source>Run Command</source>
         <translation>Изврши команда</translation>
     </message>
     <message>
         <source>File Info</source>
         <translation>Податоци за датотека</translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation>Постави правила</translation>
     </message>
     <message>
         <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>
         <source>Ok</source>
         <translation>Ок</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Грешка</translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>Неможе да се преименува</translation>
     </message>
     <message>
         <source>AdvancedFm :: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> kB free</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to View 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to View 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not Yet Implemented</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&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>
         <source>Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1 files?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1 and all it&apos;s contents?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really copy %1 files?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 already  exists. Ok to overwrite?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Could not copy %1 to %2&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy %1 As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt; %1 already exists. Ok to overwrite?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not copy %1 to %2&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt; %1 already exists. Do you really want to delete it?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not move %1&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not copy %1 to %2&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Output</source>
         <translation>Излез</translation>
     </message>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Сними го излезот во датотека (само име)</translation>
     </message>
     <message>
         <source>Process could not start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Finished
 </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Постави дозволи на датотека</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Постави дозволи на датотека за:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>Сопственик</translation>
     </message>
     <message>
         <source>group</source>
         <translation>Група</translation>
     </message>
     <message>
         <source>others</source>
         <translation>останати</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Сопственик</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Група</translation>
     </message>
     <message>
         <source>read</source>
         <translation>чиање</translation>
     </message>
     <message>
         <source>write</source>
         <translation>запишување</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>извршување</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>filePermissions</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,294 +1,233 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Appearance</name>
     <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>Settings...</source>
         <translation>Подесувања...</translation>
     </message>
     <message>
         <source>Click here to configure the currently selected style.
 
 Note:  This option is not available for all styles.</source>
         <translation>Кликни овде за конфигурација на избраниот стил
 
 Забелешка: Оваа опција не е достапна за сите стилови.</translation>
     </message>
     <message>
         <source>Window decorations control the way the application title bar and its buttons appear.
 
 Click here to select an available decoration.</source>
         <translation>Декорациите на прозорци го контролираат начинот на кој насловот и копчињата на апликацијата изгледаат.
 
 Кликни овде за избор на декорација.</translation>
     </message>
     <message>
         <source>Select the desired name, style and size of the default font applications will use.</source>
         <translation>Избери го името, стилот и големината на основниот фонт за апликациите.</translation>
     </message>
     <message>
         <source>Color schemes are a collection of colors which are used for various parts of the display.
 
 Click here to select an available scheme.</source>
         <translation>Шемите на бои се колекции на бои кои се користат за разни делови од приказот.
 
 Кликни овде за избор на шема на бои.</translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation>Моментално користена шема</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>Уреди...</translation>
     </message>
     <message>
         <source>Click here to change the colors in the current color scheme.</source>
         <translation>Килкни овде за промена на боите во моментално користената шема.</translation>
     </message>
     <message>
         <source>Delete</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>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ликни овде за избор на стил на јазичињаата (како кај оваа апликација). Стиловите на јазичињатра се:
 
 1. Јазичиња - нормални јазичиња со само со текстуални наслови
 2. Јазичиња/икони - јазичиња со икона за секое јазиче, текстуалното име се појавува само кај активното јазиче
 3. Паѓачка листа - вертикална листа на јазичињата
 4. Паѓачка листа/икони -  верикална листа на јазичињата со икони</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Јазичиња</translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
         <translation>Јазичиња/икони</translation>
     </message>
     <message>
         <source>Drop down list</source>
         <translation>Паѓачка листа</translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation>Паѓачка листа/икони</translation>
     </message>
     <message>
         <source>Top</source>
         <translation>Врв</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation>Клиикни овде за јазичињата да се појауваваат на врвот на прозорот.</translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation>Дно</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation>Кликни овде за јазичињата да се појавуваат на дното на прозорот.</translation>
     </message>
     <message>
         <source>Rotation direction:</source>
         <translation>Насока на ротација:</translation>
     </message>
     <message>
         <source>Appearance Settings</source>
         <translation>Подесувања на изгледот</translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation>Ова е прозорец за преглед. Овдека се гледа новиотт изглед на прозорците како што ги менувате опциите.</translation>
     </message>
     <message>
         <source>Style</source>
         <translation>Стил</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Фонт</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Бои</translation>
     </message>
     <message>
         <source>Windows</source>
         <translation>Прозорци</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Напредно</translation>
     </message>
     <message>
-        <source>Restart</source>
-        <translation 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>
         <translation>Уреди шема</translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation>Кликни тука за да избереш боја за:</translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
         <translation>Пример</translation>
     </message>
     <message>
         <source>Normal Item</source>
         <translation>Нормален предмет</translation>
     </message>
     <message>
         <source>Disabled Item</source>
         <translation>Исклучен предмет</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Мени</translation>
     </message>
     <message>
         <source>Normal Text</source>
         <translation>Нормален текст</translation>
     </message>
     <message>
         <source>Highlighted Text</source>
         <translation>Одбележан текст</translation>
     </message>
     <message>
         <source>Button</source>
         <translation>Копчиња</translation>
     </message>
     <message>
         <source>Check Box</source>
         <translation>Поле за штиклирање</translation>
     </message>
     <message>
         <source>Sample window using the selected settings.</source>
         <translation>Пример на прозорец користејќи ги избраните подесувања.</translation>
     </message>
 </context>
 </TS>
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
@@ -99,573 +99,565 @@
         <source>Close</source>
         <translation>Затвори</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Непознато</translation>
     </message>
     <message>
         <source>Save output</source>
         <translation>Сними излез</translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation>Опции</translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation>Форсирај Зависности</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation>Форсирај повторна инсталација</translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation>Форсирај отстранување</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation>Офрисрај Препишување</translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation>Ниво на информации</translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation>Само грешки</translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation>Нормални пораки</translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation>Информативни пораки</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation>Детален излез</translation>
     </message>
 </context>
 <context>
     <name>Ipkg</name>
     <message>
         <source>Dealing with package %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing symbolic links...
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Creating symbolic links for %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Creating symbolic links for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing status entry...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>status file - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>package - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>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>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation>AQPkg - менаџер на пакети</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation>Искуцај го текстот за пребарување.</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation>Клики овде за да се сокрие палетата за брзи скокови.</translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation>Освежи листа</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation>Кликни овде за да се освежи листата од серверите.</translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation>Надгради</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation>Кликни овде за да се надградат сите инсталирани пакети доколку постои понова верзија.</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Превземи</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation>Кликни овде за да се превземат избраните пакети.</translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation>Примени промени</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation>Кликни овде за да се инталираат, отстранат или надградат избраните пакети.</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Конфигурација</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation>Кликни овде за да ја конфигурираш апликацијава.</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Акции</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation>Прикажи ги неинсталираните пакети</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation>Кликни овде за да се прикажат пакетите кои не се инсталирани.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation>Прикажи инсталирани пакети</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation>Кликни овде за да се прикажат инсталираните пакети.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation>Прикажи ги надградените пакети</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation>Кликни овде за да се прикажат инсталираните пакети за кои има понова верзија.</translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation>Филтрирај по категорија</translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation>Кликни овде за да се прикажат пакетите кои припаѓаат на одредена категорија.</translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation>Постави категорија за филтрирање</translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation>Кликни овде за се промени категоријата за користениот филтер.</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Пронајди</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation>Кликни овде за пребарување на текст во имињата на пакетите.</translation>
     </message>
     <message>
         <source>Find next</source>
         <translation>Најди текст</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation>Кликни овде за да го најдете следниот пакет кој го содржи текстот кој го барате.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation>Палета за брзо скокање</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation>Kликни овде за да се прикаже/сокрие панелот за брзо скокање во листата со пакети.</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Преглед</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation>Кликни овде за да се сокрие палетата за пребарување.</translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation>Сервери:</translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation>Кликни овде за да се избере извор на пакети.</translation>
     </message>
     <message>
         <source>Packages</source>
         <translation>Пакети</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 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>Ова е листа на сите пакети од избраниот извор
 
 Плавата точка до името на пакетот покажува дека пакетот е инсталиран.
 
 Плавата точка до името на пакетот покажива дека постои понова верзија на тој пакет во изворот на пакети.
 
 Кликни во квадратчето лево од пакетот за да изберете истиот.</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Одстрани</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation>Кликни тука за да се отрстранта избраните пакети.</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation>Листана сервери:
 %1</translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation>Листа на пакети за:
 %1</translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
         <translation>Освежување на листи на пакети</translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation>ПРЕДУПРЕДУВАЊЕ: Надградба додека
 Oie/Qtopia е вклучена
 НЕ Е ПРЕПОРАЧЛИВО
 
 Дали си сигурен?</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Предупредување</translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
         <translation>Надградба на инсталираните пакети</translation>
     </message>
     <message>
         <source>Are you sure you wish to delete
 %1?</source>
         <translation>Дали сакаш да се избрише %1?</translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation>Сигурно?</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Не</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Да</translation>
     </message>
     <message>
         <source>Download to where</source>
         <translation>Превземи во</translation>
     </message>
     <message>
         <source>Enter path to download to</source>
         <translation>Внеси пат каде да се снимат превземените датотеки</translation>
     </message>
     <message>
         <source>Install Remote Package</source>
         <translation>Инсталирај пакет</translation>
     </message>
     <message>
         <source>Enter package location</source>
         <translation>Внеси локација на пакет</translation>
     </message>
     <message>
         <source>Nothing to do</source>
         <translation>Нема ништо за работа</translation>
     </message>
     <message>
         <source>No packages selected</source>
         <translation>Нема избрани пакети</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>ОК</translation>
     </message>
     <message>
         <source>Do you wish to remove or reinstall
 %1?</source>
         <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>
         <translation>&lt;p&gt;&lt;b&gt;Инсталирано во&lt;/b&gt; -</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Големина&lt;/b&gt; -</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Оддел&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Име на датотека&lt;/b&gt; -</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Инсталирана Верзија&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt; Достапна Верзија&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>Package Information</source>
         <translation>Информации за пакет</translation>
     </message>
     <message>
         <source>Package information is unavailable</source>
         <translation>Информациите за пакетот не се достапни</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Затвори</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Local packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>N/A</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package - %1
               version - %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
               inst version - %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Version string is empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Epoch in version is not number.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nothing after colon in version number.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QuestionDlg</name>
     <message>
         <source>Remove</source>
         <translation>Одстрани</translation>
     </message>
 </context>
 <context>
     <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation>Конфигурација</translation>
     </message>
     <message>
         <source>Servers</source>
         <translation>Сервери</translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation>Цел</translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation>Прокси сервери</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Ново</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Избриши</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Сервер</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Име:</translation>
     </message>
     <message>
         <source>Address:</source>
         <translation>Адреса:</translation>
     </message>
     <message>
         <source>Active Server</source>
         <translation>Активен Сервер</translation>
     </message>
     <message>
         <source>Update</source>
         <translation>Надгради</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation>Цел</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Локација:</translation>
     </message>
     <message>
         <source>Link to root</source>
         <translation>Поврзи со root</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
         <translation>HTTP прокси</translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation>Вклучено</translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation>FTP прокси</translation>
     </message>
     <message>
         <source>Username:</source>
         <translation>Корисничко име:</translation>
     </message>
     <message>
         <source>Password:</source>
         <translation>Лозинка:</translation>
     </message>
 </context>
 </TS>
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,156 +1,148 @@
 <!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>
     <message>
         <source>Backup Failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup and Restore.. Failed !!</source>
         <translation type="unfinished"></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 type="unfinished"></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>
         <source>Restore Backup...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;%1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore</source>
         <translation type="unfinished">Обновување</translation>
     </message>
     <message>
         <source>Would you really overwrite your local data?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <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>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>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ErrorDialog</name>
     <message>
         <source>Error Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error Message:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,340 +1,332 @@
 <!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>
         <source>CE</source>
         <translation>CE</translation>
     </message>
     <message>
         <source>log</source>
         <translation>log</translation>
     </message>
     <message>
         <source>ln</source>
         <translation>ln</translation>
     </message>
     <message>
         <source>(</source>
         <translation>(</translation>
     </message>
     <message>
         <source>)</source>
         <translation>)</translation>
     </message>
     <message>
         <source>sin</source>
         <translation>sin</translation>
     </message>
     <message>
         <source>cos</source>
         <translation>cos</translation>
     </message>
     <message>
         <source>tan</source>
         <translation>tan</translation>
     </message>
     <message>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
         <source>+/-</source>
         <translation>+/-</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>=</source>
         <translation>=</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>+</source>
         <translation>
 =</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>.</source>
         <translation>.</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <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>
         <source>Distance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>acres</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&#xb0;C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>carats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&#xb0;F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>fl oz (US)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>g</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>gal (US)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>hectares</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>km</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>l</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>lb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lg tons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ml</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>naut. mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>oz</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>pt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>qt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq km</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq yd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>St tons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tblspoon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>teaspoons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tonnes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>yd</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,750 +1,646 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation>Сметка</translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation>Нова сметка</translation>
     </message>
     <message>
         <source>Info</source>
         <translation>Информации</translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation>Трансакции</translation>
     </message>
     <message>
         <source>Charts</source>
         <translation>Графикони</translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation>Заштита со лозинка</translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation>Кликни овде за да се заштити со лозинка оваа сметка.</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Име:</translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation>Овде внеси име на смтеката.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Тип:</translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation>Избети тип на сметка овде.</translation>
     </message>
     <message>
-        <source>Savings</source>
-        <translation 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>
         <source>Enter account number for this checkbook here.</source>
         <translation>Внеси го бројот на сметката овде.</translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation>PIN број:</translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation>Внеси PIN број за оваа сметка.</translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation>Почетна состојба:</translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation>Внеси ја почетната состојба на оваа сметка.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Забелешки:</translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation>Внеси додатни информации за сметката.</translation>
     </message>
     <message>
-        <source>Current balance: %10.00</source>
-        <translation 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>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Опис</translation>
     </message>
     <message>
         <source>Amount</source>
         <translation>Сума</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Нова</translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation>Кликни овде за внесување на нова трансакција.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Уреди</translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation>Одбери трансакција и потоа кликни овде за да се измени.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Избриши</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation>Избери сметка и потоа кликни овде зада се избрише.</translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation>Избери го саканиот графикон и потоа кликни на Нацртај копчето.</translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation>Кликни на саканиот тип на графикон.</translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation>Состојба на сметка</translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation>Повлекувања на средства по категорија</translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation>Депозити по категорија</translation>
     </message>
     <message>
         <source>Draw</source>
         <translation>Нацртај</translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation>Кликни овде за да се нацрта избраниот графикон.</translation>
     </message>
     <message>
-        <source>Current balance: %1%2</source>
-        <translation type="obsolete">Моментална состојба: %1 %2</translation>
-    </message>
-    <message>
         <source>Enter password</source>
         <translation>Внеси лозинка</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Внесете лозинка:</translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation>Потврдете лозинка</translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation>Потврдете лозинка:</translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation>Внесете лозинка за да го потврдите бришењето на заштитата со лозинка:</translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation>Избриши трансакција</translation>
     </message>
     <message>
         <source>Sort by:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select checkbook sorting here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entry Order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SortDate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Balance</source>
         <translation type="unfinished">Состојба</translation>
     </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation>Конфигурирај Сметка</translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation>Внеси симбол за валута:</translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation>Внеси ги симболот на локалната валута овде.</translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation>Покажи дали сметката е заштитена 
 со лозинка</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
         <translation>Кликни овде за да се избере дали на главниот прозорец да се покажува дали сметката е заштитена или не со лозинка.</translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation>Покажи состојби на сметки</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation>Кликно овде за да се избере дали главниот прозорец ќе ги прикажува моменталните состојби за секоја сметка.</translation>
     </message>
     <message>
         <source>&amp;Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Account Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Account Types</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Payees</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open last checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether the last open checkbook will be opened at startup.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show last checkbook tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save new description as payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to save new descriptions in the list of payess.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ListEdit</name>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Избриши</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation>Сметка</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Нова</translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation>Кликни овде за да се креира нова сметка.
 
 Може исто така да изберете Ново од менито на Сметка.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Уреди</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation>Избери сметка и потоа кликни овде за да се уредува.
 
 Може исто да се одбере Уреди од менито Сметка, или да се кликне и да се задржи на името на сметката.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Избриши</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation>Избери сметка и потоа кликни овде за да се избрише.
 
 Исто така можете да изберете Избриши од менито Сметка.</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Конфигурација</translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation>Кликни овде за да конфигурира апликацијава.</translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation>Ова е листа на моментално достапните сметки.</translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation>Име на сметка</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>Состојба</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Внеси лозинка</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Внесете лозинка:</translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation>Избриши сметка</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>Date</source>
         <translation type="unfinished">Дата</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Уреди</translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished">Нова</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Избриши</translation>
     </message>
     <message>
         <source>Savings</source>
         <translation type="unfinished">Штедна</translation>
     </message>
     <message>
         <source>Checking</source>
         <translation type="unfinished">Тековна</translation>
     </message>
     <message>
         <source>CD</source>
         <translation type="unfinished">Кредитна</translation>
     </message>
     <message>
         <source>Money market</source>
         <translation type="unfinished">Пазар на пари</translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation type="unfinished">Заеднички фонд</translation>
     </message>
     <message>
         <source>Other</source>
         <translation type="unfinished">Останато</translation>
     </message>
     <message>
         <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation type="unfinished">Автомобил</translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="unfinished">Сметки</translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="unfinished">ЦД-а</translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="unfinished">Облека</translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="unfinished">Компјутер</translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="unfinished">DVD-а</translation>
     </message>
     <message>
         <source>Electronics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation type="unfinished">Забава</translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="unfinished">Храна</translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="unfinished">Гориво</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished">Општо</translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="unfinished">Филмпви</translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="unfinished">Кирија</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished">Патувања</translation>
     </message>
     <message>
         <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished">Работа</translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation type="unfinished">Член на фамилија</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation type="unfinished">Општо Кредит</translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation>Трансакција за</translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation>Повлекување средства</translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation>Овде се избира дали трансакцијата е повлекување на средства или депозит.</translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation>Депозит</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Датум:</translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation>Избери датум на трансакцијата.</translation>
     </message>
     <message>
         <source>Number:</source>
         <translation>Број:</translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation>Внеси број на чек.</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Опис:</translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation>Внеси опис на трансакцијата.</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Категорија:</translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation>Избери категорија на трансакцијата.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Тип:</translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation>Избери тип на трансакција.
 
 Опциите варираат во зависност од тоа дали трансакцијата е депозит или повлекување на средства.</translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation>Сума:</translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation>Внеси сума на трансакцијата.
 
 Внесената вредност треба секогаш да е позитивна.</translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation>Такса:</translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation>Внеси ја сумата на таксата поврзана со трансакцијата.
 
 Вредноста секогаш теба да биде позитивна.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Забелешки:</translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation>Внеси додатни информации за трансакцијата.</translation>
     </message>
     <message>
-        <source>Automobile</source>
-        <translation 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
@@ -1,282 +1,206 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AlarmDlg</name>
     <message>
         <source>Clock</source>
         <translation type="unfinished">Саат</translation>
     </message>
     <message>
         <source>Snooze</source>
         <translation type="unfinished">Одложи</translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AlarmDlgBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>TextLabel1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Snooze</source>
         <translation type="unfinished">Одложи</translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thu</source>
         <comment>Thursday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fri</source>
         <comment>Friday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat</source>
         <comment>Saturday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sun</source>
         <comment>Sunday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lap/Split</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Daily Alarm:&lt;/b&gt;&lt;p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily alarm requires at least
 one day to be selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished">Сите</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished">Аудио</translation>
     </message>
 </context>
 <context>
     <name>ClockBase</name>
     <message>
         <source>Clock</source>
         <translation type="unfinished">Саат</translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stopwatch</source>
         <translation type="unfinished">Штоперица</translation>
     </message>
     <message>
         <source>Split</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished">Старт</translation>
     </message>
     <message>
         <source>Starts and stops the stopwatch.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lap/Split</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Resets the stopwatch.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check to enable the daily alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the hour the alarm will sound.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the minute the alarm will sound.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished">AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished">PM</translation>
     </message>
     <message>
         <source>Days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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
@@ -1,867 +1,829 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation>Календар</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Нов</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>Денес</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Ден</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Недела</translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation>Листа на недели</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Месец</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Пронајди</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>Уреди...</translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation>ТЅраењето на настанот е подолго околку 
 интервалот помежу повторувањата.</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Неможе да се менуваат податоците, во моментов се синхронизира</translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation>Дупликат на настан</translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation>Уреди настан</translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation>Минути)</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>ОК</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Нема доволно простор</translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation>Календарот неможеше 
 да ги зачува промените
 Ослободи простор и овиди се повторно
 
 Прекини?
 </translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation>(Непознато)</translation>
     </message>
     <message>
         <source>Error!</source>
         <translation>Грешка!</translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation>Поправи</translation>
     </message>
     <message>
         <source>Continue</source>
         <translation>Продолжи</translation>
     </message>
     <message>
         <source>error box</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation>П</translation>
     </message>
     <message>
         <source>T</source>
         <translation>В</translation>
     </message>
     <message>
         <source>W</source>
         <translation>С</translation>
     </message>
     <message>
         <source>F</source>
         <translation>П</translation>
     </message>
     <message>
         <source>S</source>
         <translation>С</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Понеделник</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Вторник</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Среда</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Четврток</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Петок</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Сабота</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Недела</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00р</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Ова е настан кој трае цел ден.</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Почеток</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Крај</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Време</translation>
     </message>
     <message>
         <source> - </source>
         <translation>-</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Уреди</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Дуплирај</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Избриши</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Испрати</translation>
     </message>
     <message>
         <source>Beam this occurence</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>Calendar</source>
         <translation>Календар</translation>
     </message>
     <message>
         <source>:00 PM</source>
         <translation>:00 РМ</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation>:00 АМ</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>РМ</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>АМ</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>Особини</translation>
     </message>
     <message>
         <source>Views</source>
         <translation>Прегледи</translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation>Основен преглед:</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Ден</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Недела</translation>
     </message>
     <message>
         <source>Week List</source>
         <translation>Листа на недели</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>1Месец</translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation>Скокни на моментално време</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>Стил на редови:</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Основен</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Среден</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Голем</translation>
     </message>
     <message>
         <source>Time display</source>
         <translation>Приказ на време</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ништо</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Почеток</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation>Почеток-Крај</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Општо</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation>Подесувања за аларм</translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation>Претпоставки за Аларм</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>минути</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation>Почни преглед на настани</translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation>Време на Почеток:</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Основни</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Локација:</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Канцеларија</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Дома</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Категорија:</translation>
     </message>
+    <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>
         <translation>С</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Јан-00. Јан</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstEvent</name>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Уреди</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished">Дуплирај</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Избриши</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished">Испрати</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>С</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>С: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
-        <source>Mo</source>
-        <comment>Monday</comment>
-        <translation type="obsolete">Пон.
-Понеделник</translation>
-    </message>
-    <message>
-        <source>Tu</source>
-        <comment>Tuesday</comment>
-        <translation type="obsolete">Втор.
-Вторник</translation>
-    </message>
-    <message>
-        <source>We</source>
-        <comment>Wednesday</comment>
-        <translation type="obsolete">Сред,
-Среда</translation>
-    </message>
-    <message>
-        <source>Th</source>
-        <comment>Thursday</comment>
-        <translation type="obsolete">Чет.
-Четврток</translation>
-    </message>
-    <message>
-        <source>Fr</source>
-        <comment>Friday</comment>
-        <translation type="obsolete">Пет.
-Петок</translation>
-    </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>
         <translation>Време на завршување</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Календар</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>Повторување...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>Дневен...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>Неделно...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>Месечно...</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>Годишно...</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Без Повторување...</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>Нов настан</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Локација</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Категорија</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Состанок</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Ручек</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Ручек</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Патување</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Опис</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Канцеларија</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Дома</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>Почеток-Крај</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>Јан 02 00</translation>
     </message>
     <message>
         <source>Start time</source>
         <translation type="unfinished">Време на почеток</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Цел Ден</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Временска зона</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Аларм</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>минути</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Тивок</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Гласно</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Повторување</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Без Повторување...</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Забелешка...</translation>
     </message>
-    <message>
-        <source>Start Time</source>
-        <translation type="obsolete">Време на почеток</translation>
-    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Уреди забелешка</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Ручек</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Почеток</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Крај</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Секој</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 секој</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>%1 секој</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>%1 %1 од секој</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Секој</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Понеделник</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Вторник</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Среда</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Четврток</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Петок</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Сабота</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Недела</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>ст</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>нд</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>рд</translation>
     </message>
     <message>
         <source>th</source>
         <translation>тх</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation>Без Повторување</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>денови</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>недели</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Повторување по</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Ден</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Датум</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>месеци</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>години</translation>
     </message>
     <message>
         <source>days</source>
         <translation>денови</translation>
     </message>
     <message>
         <source>day</source>
         <translation>ден</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>недели</translation>
     </message>
     <message>
         <source>week</source>
         <translation>недела</translation>
     </message>
     <message>
         <source>month</source>
         <translation>месец</translation>
     </message>
     <message>
         <source>year</source>
         <translation>година</translation>
     </message>
     <message>
         <source> and </source>
         <translation>и</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>, и</translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, и</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Повторувачки настан</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ништо</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Ден</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Недела</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Месец</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Година</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Секој:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Фреквенција</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Крај на:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Без краен датум</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Вклучи повторување</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Пон</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Втор</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Сред</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Чет</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Пет</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Саб</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Нед</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Секој</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Вар1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Вар 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>Недела Вар</translation>
     </message>
     <message>
         <source>months</source>
         <translation>месеци</translation>
     </message>
     <message>
         <source>years</source>
         <translation>години</translation>
     </message>
 </context>
 </TS>
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,313 +1,249 @@
 <!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>
         <source>Cyan on White</source>
         <translation>Плаво на Бело</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>Бело на Плава</translation>
     </message>
     <message>
         <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>
         <source>Tab</source>
         <translation>Јазиче</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Горе</translation>
     </message>
     <message>
         <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>
         <source>ScrollBar</source>
         <translation>Лизгач</translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation>Завиткај</translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation>Користи звучен сигнал</translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation>Покажи листа на команди</translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation>Скриј листа на команди</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>
         <source>Hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Pink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pink on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>new session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sessions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To exit fullscreen, tap here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History Lines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konsole </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Избор на команди</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation>Додади команда</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation>Внеси Команда за додавање:</translation>
     </message>
 </context>
 </TS>
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
@@ -1,100 +1,96 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FifteenConfigDialog</name>
     <message>
         <source>All Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select board background</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FifteenConfigDialogBase</name>
     <message>
         <source>Configure Fifteen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use a Custom Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Path:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Preview:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Grid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Rows:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
 <context>
     <name>PiecesTable</name>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Петнаесет Парчиња</translation>
     </message>
     <message>
         <source>Congratulations!
 You win the game!</source>
         <translation>Браво!
 Победи!</translation>
     </message>
     <message>
         <source>R&amp;andomize Pieces</source>
         <translation>Р&amp;астури парчиња</translation>
     </message>
     <message>
         <source>&amp;Reset Pieces</source>
         <translation>&amp;Постави парчиња</translation>
     </message>
 </context>
 </TS>
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
@@ -1,213 +1,173 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FormatterApp</name>
     <message>
         <source>Formatter</source>
         <translation>Форматер</translation>
     </message>
     <message>
         <source>Storage Type</source>
         <translation>Тип на медиум</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ок</translation>
     </message>
     <message>
         <source>Formatter Output</source>
         <translation>Излез од форматер</translation>
     </message>
     <message>
         <source>Trying to umount.</source>
         <translation>Се обидувам да откачам.</translation>
     </message>
     <message>
         <source>umount failed!</source>
         <translation>откачувањето беше неуспешно!</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>
 &amp;ОК</translation>
     </message>
     <message>
         <source>Could not umount.
 Device is busy!</source>
         <translation>Неможев да откачам.Уредот е зафатен!</translation>
     </message>
     <message>
         <source>Trying to format.</source>
         <translation>Се обидувам да форматирам.</translation>
     </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>
         <source>Available: %1 kB ( %d mB)</source>
         <translation>Слободни: %1 kB (%d mB)</translation>
     </message>
     <message>
         <source>CAUTION:
 Changing parameters on this
 page may cause your system
 to stop functioning properly!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Format?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 with %1 filesystem?
 You will loose all data!!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Trying to umount %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Trying to mount %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1
 has been successfully mounted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Storage Type: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type: %1
 Formatted with %2
 %3, %4, %5</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,56 +1,52 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GoMainWidget</name>
     <message>
         <source>New Game</source>
         <translation>Нова Игра</translation>
     </message>
     <message>
         <source>Pass</source>
         <translation>Обид</translation>
     </message>
     <message>
         <source>Resign</source>
         <translation>Повлечи се</translation>
     </message>
     <message>
         <source>Two player option</source>
         <translation>Оции за два играчи</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Игра</translation>
     </message>
 </context>
 <context>
     <name>GoWidget</name>
     <message>
         <source>White %1, Black %2. </source>
         <translation>Бели %1, Црни %2.</translation>
     </message>
     <message>
         <source>White wins.</source>
         <translation>Белиот победи.</translation>
     </message>
     <message>
         <source>Black wins.</source>
         <translation>Црниот победи.</translation>
     </message>
     <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
@@ -1,68 +1,64 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KBill</name>
     <message>
         <source>kBill</source>
         <translation>кБили</translation>
     </message>
     <message>
         <source>New game</source>
         <translation>Нова игра</translation>
     </message>
     <message>
         <source>Pause game</source>
         <translation>Паузирај игра</translation>
     </message>
     <message>
         <source>Story of kBill</source>
         <translation>Приказната за кБили</translation>
     </message>
     <message>
         <source>Rules</source>
         <translation>Правила</translation>
     </message>
     <message>
         <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>
         <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 disguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>UI</name>
     <message>
         <source>After Level</source>
         <translation>Следно ниво</translation>
     </message>
     <message>
         <source>Your score</source>
         <translation>Бодови</translation>
     </message>
 </context>
 </TS>
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
@@ -1,296 +1,292 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KRFBConnection</name>
     <message>
         <source>Connected</source>
         <translation>Поврзано</translation>
     </message>
     <message>
         <source>Connection Refused</source>
         <translation>ПОврзувањето е одбиено</translation>
     </message>
     <message>
         <source>Host not found</source>
         <translation>Не е пронајден серверот</translation>
     </message>
     <message>
         <source>Read Error: QSocket reported an error reading
 data, the remote host has probably dropped the
 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>
         <source>Protocol Error: An unknown encoding was used by the server %1</source>
         <translation>Грешка на протокол: Серверот %1 користеше непозната кодна табела </translation>
     </message>
     <message>
         <source>Waiting for server initialization...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KRFBLogin</name>
     <message>
         <source>Waiting for server version...</source>
         <translation>Чекам верзија на серверот...</translation>
     </message>
     <message>
         <source>Error: Invalid server version, %1</source>
         <translation>Грешка: Невалидна верзија на сервер, %1</translation>
     </message>
     <message>
         <source>Error: Unsupported server version, %1</source>
         <translation>Грешка: Неподрана верзија на сервер, %1</translation>
     </message>
     <message>
         <source>Logged in</source>
         <translation>Логирано</translation>
     </message>
     <message>
         <source>Error: This server requires a password, but none has been specified.
 </source>
         <translation>Грешка: Серверот бара лозинка, лозинката не е специфицирана.
 </translation>
     </message>
     <message>
         <source>Error: The password you specified was incorrect.</source>
         <translation>Грешка: Внесената лозинка не е валидна.</translation>
     </message>
     <message>
         <source>Error: Too many invalid login attempts have been made
 to this account, please try later.</source>
         <translation>Грешка: Премногу невалидни обиди за логирање
 на овој корисник, обидете се подоцна.</translation>
     </message>
     <message>
         <source>Login Failed</source>
         <translation>Неуспешно логирање</translation>
     </message>
     <message>
         <source>Too many failures</source>
         <translation>Премногу грешки</translation>
     </message>
 </context>
 <context>
     <name>KVNC</name>
     <message>
         <source>VNC Viewer</source>
         <translation>VNC прегледувач</translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation>Ново поврзување</translation>
     </message>
     <message>
         <source>Open Bookmark</source>
         <translation>Отвори линк</translation>
     </message>
     <message>
         <source>Delete Bookmark</source>
         <translation>Избриши линк</translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation>Цел екран</translation>
     </message>
     <message>
         <source>Send Contrl-Alt-Delete</source>
         <translation>Прати Ctrl-ALt-Del</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>Откачи врска</translation>
     </message>
     <message>
         <source>Next Click is Double Click</source>
         <translation>Следнити кликање е двојно кликање</translation>
     </message>
     <message>
         <source>Next Click is Right Click</source>
         <translation>Следното кликаже е клик со десно копче</translation>
     </message>
     <message>
         <source>Stop Full Screen</source>
         <translation>Затвори цел екран</translation>
     </message>
     <message>
         <source>Connected to remote host</source>
         <translation>Поврзи се со сервер</translation>
     </message>
     <message>
         <source>Logged in to remote host</source>
         <translation>Логиран на сервер</translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation>Прекината врска</translation>
     </message>
 </context>
 <context>
     <name>KVNCBookmarkDlgBase</name>
     <message>
         <source>Bookmarks</source>
         <translation>Листа на линкови</translation>
     </message>
     <message>
         <source>Choose a bookmark that you would like to open</source>
         <translation>Избери линк кој треба да се отвори</translation>
     </message>
 </context>
 <context>
     <name>KVNCConnDlgBase</name>
     <message>
         <source>VNC Viewer Connection</source>
         <translation>VNC поврзување</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Сервер</translation>
     </message>
     <message>
         <source>The password of the VNC server</source>
         <translation>Лозинката на VNC серверот</translation>
     </message>
     <message>
         <source>Show Password</source>
         <translation>Покажи лозинка</translation>
     </message>
     <message>
         <source>Toggle obscuring the password</source>
         <translation>Вклучи прикривање на лозинката</translation>
     </message>
     <message>
         <source>Password:</source>
         <translation>Лозинка:</translation>
     </message>
     <message>
         <source>The name of the VNC server</source>
         <translation>Име на VNC серверот</translation>
     </message>
     <message>
         <source>Bookmark Name:</source>
         <translation>Име на линк:</translation>
     </message>
     <message>
         <source>The host name of the VNC server</source>
         <translation>Име на компјутерот со VNC сервер</translation>
     </message>
     <message>
         <source>Host Name:</source>
         <translation>Име на сервер:</translation>
     </message>
     <message>
         <source>Display Number:</source>
         <translation>Број на приказ:</translation>
     </message>
     <message>
         <source>The display number of the VNC server</source>
         <translation>Број на приказ на VNC серверот</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Опции</translation>
     </message>
     <message>
         <source>Request shared session</source>
         <translation>Барај сесија која се дели</translation>
     </message>
     <message>
         <source>Allow other users to connect to the VNC server</source>
         <translation>Дозволи и други корисници да се поврзуваат со VNC серверот</translation>
     </message>
     <message>
         <source>Request 8-bit session</source>
         <translation>Барај 8-битна сесија</translation>
     </message>
     <message>
         <source>Request that the VNC server transfer 8 bit color</source>
         <translation>Барај пренос на 8-битна боја од VNC серверот</translation>
     </message>
     <message>
         <source>Delay between requesting updates from the server</source>
         <translation>Време помеѓу освежувања од серверот</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>Scale the remote display to fit on the PDA (Slow)</source>
         <translation>Намалиго екранот на серверот за да го собере на PDA-то (споро)</translation>
     </message>
     <message>
         <source>Scale Factor</source>
         <translation>Фактор на намалување</translation>
     </message>
     <message>
         <source>Milliseconds</source>
         <translation>Милисекунди</translation>
     </message>
     <message>
         <source>Raise on bell</source>
         <translation>Крени на повик</translation>
     </message>
     <message>
         <source>Check for screen updates every:</source>
         <translation>Провери освежувања на екран секои:</translation>
     </message>
     <message>
         <source>Encodings</source>
         <translation>Кодни табели</translation>
     </message>
     <message>
         <source>Hextile encoding</source>
         <translation>Хекса кодни табели</translation>
     </message>
     <message>
         <source>CoRRE encoding</source>
         <translation>CoRRE кодна табела</translation>
     </message>
     <message>
         <source>RRE encoding</source>
         <translation>REE кодна табела</translation>
     </message>
     <message>
         <source>Copy rectangle encoding</source>
         <translation>Копирај правоаголник</translation>
     </message>
     <message>
         <source>Enable transmiting identical rectangles as references to existing data</source>
         <translation>Вклучи емитирање на идентични правоаголници како рефернеци за постоечки податоци</translation>
     </message>
 </context>
 </TS>
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
@@ -1,286 +1,278 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DocTabSettings</name>
     <message>
         <source>Enable the Documents Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check, if you want the Documents Tab to be visible.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputMethodSettings</name>
     <message>
         <source>Resize application on Popup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable floating and resizing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check, if you want the application to be automatically resized if the input method pops up.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check, if you want to move and/or resize input methods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Specify the percentage of the screen width for the input method</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherSettings</name>
     <message>
         <source>Launcher Settings</source>
         <translation>Подесувања на мени</translation>
     </message>
     <message>
         <source>Taskbar</source>
         <translation>Палета</translation>
     </message>
     <message>
         <source>O-Menu</source>
         <translation>О-мени</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Табови</translation>
     </message>
     <message>
         <source>InputMethods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MenuSettings</name>
     <message>
         <source>Load applets in O-Menu:</source>
         <translation>Вчитај аплети во О-мени:</translation>
     </message>
     <message>
         <source>Show Launcher tabs in O-Menu</source>
         <translation>Прикажи ги јазичињата од главното во О-менито</translation>
     </message>
     <message>
         <source>Check the applets that you want to have included in the O-Menu.</source>
         <translation>Одбележи ги аплетите кои ќе бидат во О-менито.</translation>
     </message>
     <message>
         <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
         <translation>Додава содржини од главното мени во О-менито.</translation>
     </message>
     <message>
         <source>Show Applications in Subpopups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Sample 1</source>
         <translation>Пример 1</translation>
     </message>
     <message>
         <source>Sample 2</source>
         <translation>Пример 2</translation>
     </message>
     <message>
         <source>Sample 3</source>
         <translation>Пример 3</translation>
     </message>
 </context>
 <context>
     <name>TabDialog</name>
     <message>
         <source>Edit Tab</source>
         <translation>Уреди Јазиче</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>Позадина</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Фонт</translation>
     </message>
     <message>
         <source>Icons</source>
         <translation>Икони</translation>
     </message>
     <message>
         <source>Previewing %1</source>
         <translation>Преглед на %1</translation>
     </message>
     <message>
         <source>This is a rough preview of what the currently selected Tab will look like.</source>
         <translation>Ова е груб преглед на  избраното јазиче.</translation>
     </message>
     <message>
         <source>Use a custom font</source>
         <translation>Користи свој фонт</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Тип:</translation>
     </message>
     <message>
         <source>Ruled</source>
         <translation>Подредено</translation>
     </message>
     <message>
         <source>Solid color</source>
         <translation>Полна боја</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Слика</translation>
     </message>
     <message>
         <source>Select...</source>
         <translation>Избери...</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Основни</translation>
     </message>
     <message>
         <source>Size:</source>
         <translation>Големина:</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Мало</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Големо</translation>
     </message>
     <message>
         <source>Color:</source>
         <translation>Боја:</translation>
     </message>
     <message>
         <source>Columns:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatic</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TabsSettings</name>
     <message>
         <source>Launcher Tabs:</source>
         <translation>Јазичиња на главно мени:</translation>
     </message>
     <message>
         <source>foobar</source>
         <translation>панел</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Ново</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Уреди</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Избриши</translation>
     </message>
     <message>
         <source>Enable big busy indicator</source>
         <translation>Вклучи голем индикатор за зафатеност</translation>
     </message>
     <message>
-        <source>Enable blinking busy indicator</source>
-        <translation 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>
         <source>Not implemented yet</source>
         <translation>Не е имплементирано</translation>
     </message>
     <message>
         <source>Enable animated busy indicator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Activate this, if you want an animatedbusy indicator for starting applications in the Launcher.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable static background pixmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Activate this, if you want the background pixmap not to scroll with the icons.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskbarSettings</name>
     <message>
         <source>Load applets in Taskbar:</source>
         <translation>Вчитај аплети во панелот:</translation>
     </message>
     <message>
         <source>Check the applets that you want displayed in the Taskbar.</source>
         <translation>Одбери ги аплетите што треба да се прикажат во панелот.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/libbatteryapplet.ts b/i18n/mk/libbatteryapplet.ts
index 699b5b9..8c2c3e9 100644
--- a/i18n/mk/libbatteryapplet.ts
+++ b/i18n/mk/libbatteryapplet.ts
@@ -1,110 +1,86 @@
 <!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>
         <source>Very Low</source>
         <translation>Многу ниско</translation>
     </message>
     <message>
         <source>Critical</source>
         <translation>Критично</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Непознато</translation>
     </message>
     <message>
         <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>
         <source>Remaining Power: %1%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remaining Time: %1m %2s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remaing Power: %1 %2
 Remaining Time: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ipaq  %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,1126 +1,727 @@
 <!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>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished">Недела</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished">Месец</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished">Година</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished">Секој:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished">Фрекфенција</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished">Настан на:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">Нема краен датум</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">Вклучи повторување</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">Пон</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">Втор</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">Сред</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">Чет</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">Пет</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">Саб</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">Нед</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">Секој</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished">Пром1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished">Пром2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished">НеделаПром</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">Нема краен датум</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished">денови</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished">ден</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished">недели</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished">недела</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished">месеци</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished">месец</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished">години</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished">година</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished">и</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished">,
 и</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished">, и</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished">Без повторување</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished">денови</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">Вклучи повторување</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">Пон</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">Втор</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">Сред</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">Чет</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">Пет</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">Саб</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">Нед</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished">недели</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished">Повторувај по</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">Ден</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="unfinished">месеци</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished">години</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">Секој</translation>
     </message>
 </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>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to edit the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to duplicate the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to delete the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to transmit the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</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>
         <source>High</source>
         <translation>Висок</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Нормално</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Низок</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation>Многу ниско</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Напредок:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Краен рок:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Категорија:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation>Основна E-mail адреса:</translation>
     </message>
     <message>
-        <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
-        <translation type="obsolete">&lt;b&gt;Работна Адреса:&lt;/b&gt;</translation>
-    </message>
-    <message>
         <source>Office: </source>
         <translation>Канцеларија:</translation>
     </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>
         <source>Home Mobile: </source>
         <translation>Приватен Мобилен:</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation>Сите електронски писма:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Професија:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Асистент:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Менаџер:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Машки</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Женски</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Пол:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Сопруг/Сопруга:</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Роденден:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Годишнина:</translation>
     </message>
     <message>
         <source>Children: </source>
         <translation>Деца:</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Надимак:</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Забелешки:</translation>
     </message>
     <message>
         <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>Start:</source>
         <translation>Старт:</translation>
     </message>
     <message>
         <source>End:</source>
         <translation>Крај:</translation>
     </message>
     <message>
         <source>Note:</source>
         <translation>Забелешка:</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Секој</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 секој</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>%1 секој</translation>
     </message>
     <message>
-        <source>The %1 %1 of every</source>
-        <translation type="obsolete">%1 %1 од секој</translation>
-    </message>
-    <message>
         <source>Every </source>
         <translation>Секој</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Понеделник</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Вторник</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Среда</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Четврток</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Петок</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Сабота</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Недела</translation>
     </message>
     <message>
         <source>The %1 %2 of every</source>
         <translation type="unfinished">%1 %2 од секој</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profession</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Has a due-date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No due-date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No reccurrence</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No start-date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No completed-date</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>st</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>nd</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>rd</translation>
     </message>
     <message>
         <source>th</source>
         <translation>th</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/libopieui2.ts b/i18n/mk/libopieui2.ts
index 23f5c13..01d0698 100644
--- a/i18n/mk/libopieui2.ts
+++ b/i18n/mk/libopieui2.ts
@@ -1,797 +1,175 @@
 <!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>
     </message>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished">Име</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished">Големина</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished">Mime Тип</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished">Диалог на датотеки</translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished">Отвори</translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished">Сними</translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished">Име:</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation type="unfinished">Стил</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished">Големина</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished">Кафеавата лисица рипа преку мрзливото куче</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="unfinished">Име</translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished"></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="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
@@ -1,1034 +1,992 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation>Сите</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Не е внесено</translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation>(повеќе)</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Бизнис</translation>
     </message>
     <message>
         <source>Personal</source>
         <translation>Лични</translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation>(Повеќе)</translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation>Сите</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>Нова категорија</translation>
     </message>
     <message>
         <source>New Category </source>
         <translation>Нова категорија</translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation>Уреди Категорија</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>Категории</translation>
     </message>
     <message>
         <source>Application</source>
         <translation>Апликација</translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation>Овде идат категориите</translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation>Види во кои категории спаѓа документов.</translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation>Внеси нова категорија. Притисни &lt;b&gt;Додај&lt;/b&gt; за да се додаде на листата.</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Додај</translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation>Внеси нова категорија лево и притисни додај за да се додаде на листата.</translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation>Притисни за да сеизбрише избраната категорија.</translation>
     </message>
     <message>
         <source>Global</source>
         <translation>Глобална</translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation>Избери за ова својство да биде достапно на сите апликации.</translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation>Сите</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Не е внесено</translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation>Грешка</translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation>Друга апликација ги 
 уредува категориите.</translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation>Уреди категории</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Сите</translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation>Прикажи го Јануари во избраната година</translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation>Прикажи го претходниот месец</translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation>Прикажи го следниот месец</translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation>Прикаѓи го Декември во избраната година</translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation>Затвори го избирачот на датотеки</translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation>Прикажи ги документите од овој тип</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Преглед на документи</translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation>Прикажи ги документите во оваа категорија</translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation>Кликни за да избереш документ од листата</translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation>, или избери &lt;b&gt;Нов Документ&lt;/b&gt; за да се креира нов документ.</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation>&lt;br&gt;&lt;br&gt;Кликни и држи за својства на докуументот.</translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation>Име</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <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>
         <source>Find what:</source>
         <translation>Барај:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Категрија:</translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation>Почни со пребарување на:</translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation>Дек 02 01</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Внимавај на големина на карактери</translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation>Барај наназад</translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Properties</source>
         <translation>Својства</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Преглед на документи</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Избриши</translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation>Бришењето на датотеката неуспеа.</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Тврд Диск</translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation>Копија на</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Дупликат</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>Неуспешно копирање.</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Детали</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>Поместувањето на документот неуспеа.</translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation>Детали</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation>Користи сопствена ротација</translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation>Однапред вчитај ја апликацијава, за да биде веднаш достапна.</translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation>Името на овој документ.</translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation>Медимуот на кој е сместен документот.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Тип:</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Локација:</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Име:</translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation>Брззо вчитување (одзема меморија)</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>Коментар:</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Избриши</translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation>Избриши го документов.</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Копирај</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation>Направи копија на документов.</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Пренеси</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation>Пренеси го документов на друг уред.</translation>
     </message>
     <message>
         <source>Arguments:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>Информации за сопственикот</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Ок</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Внеси лозинка</translation>
     </message>
 </context>
 <context>
     <name>QMessageBox</name>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>Имаше проблем при креирањето на 
 конфигурациските информации
 за овој програм.
 
 Ослободете простор и
 обидете се повторно.</translation>
     </message>
     <message>
         <source>Unable to create start up files
 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>
         <source>year</source>
         <translation>година</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>ПМ</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>АМ</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Пон</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Втор</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Сред</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Чет</translation>
     </message>
     <message>
         <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>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Домашна Адреса:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation>E-mail адреса:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Домашен Телефон:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Домашен Факс:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Приватен Мовилен:</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Приватна интернет страна:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Службена интернет страна:</translation>
     </message>
     <message>
         <source>Office: </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>Profession: </source>
         <translation>Професија:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Асистент:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Раководител:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Маж</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Жена</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Пол:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Споруг/Сопруга:</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Роденден:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Годишнина:</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Надимак:</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Титула</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Име</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Средно Име</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Презиме</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Суфикс</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Сними како</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Работно место</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Одделение</translation>
     </message>
     <message>
         <source>Company</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>Default Email</source>
         <translation>Основна E-mail адреса</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>Е-mail адреси</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Домашен Телефон</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Домашен Факс</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Приватен Мовилен</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Улица на фирмата</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Град на фирмата</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>Држава на фирмата</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>Поштенски код на фирмата</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>Држава на фирмата</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Службен пејџер</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Службена интернет страна</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Канцеларија</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Професија</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Асистент</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Раководител</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Домашна улица</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Домашен град</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>Домашна држава</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>Домашен поштенски број</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>Домажна држава</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Приватна интернет страна</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Споруг/Сопруга</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Пол</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Роденден</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Годишнина</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Надимак</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Деца</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Забелешки</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Групи</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete
  %1?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>May</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jul</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oct</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nov</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation type="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>
     <message>
         <source>%1 document</source>
         <translation>%1 документ</translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation type="unfinished">Кликни за да го затвориш овој прозорец, занемарувајќи ги промените.</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation type="unfinished">Кликни за да го затвориш овој прозорец.</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation type="unfinished">Кликни за да го затвориш овој прозорец, памтејќи ги промените.</translation>
     </message>
     <message>
         <source>Click to make this window movable.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
         <translation type="unfinished">Кликни за проорецот да ја покрие целата површина на екранот.</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maximize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>CF картичка</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Тврд диск</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>SD картичка</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>MMC картичка</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>SCSI тврд диск</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>Внатрешна меморија</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Внатрешен медиум</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>Ништо</translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation>Извршната датотека „време на град“ не е пронајдена</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation>За да ги одберете временските зони,
 инсталирајте го „време на град“.</translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Нема доволно простор</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Неможе да се намести алармот.
 Ослободете меморија и обидете се повторно</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>%1 датотеки</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>%1 %2</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>Сите %1 датотеки</translation>
     </message>
     <message>
         <source>All files</source>
         <translation>Сите датотеки</translation>
     </message>
 </context>
 <context>
     <name>WindowDecoration</name>
     <message>
         <source>Default</source>
         <comment>List box text for default window decoration</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,114 +1,102 @@
 <!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>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation>Оваа боја ке се користи за да ги прикажува родендените/годишнините!</translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation>Намести боја за 
 итно ако е под</translation>
     </message>
     <message>
         <source> days: </source>
         <translation>денови:</translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation>Оваа боја ќе се користи ако настанот наближува!</translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation>Оваа боја ќе се користи ако роденденот/годишнијната е поблиски од дадениот број на денови!</translation>
     </message>
     <message>
         <source>Enable/Disable Views</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show &amp;Birthdays</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show &amp;Anniveraries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The next birthdays will just be shown, if enabled!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The next anniversaries will just be shown, if enabled !</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>AddressBook plugin</source>
         <translation>Додаток Адресар</translation>
     </message>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>Следниот роденден е во &lt;b&gt;%1&lt;/b&gt; денови:</translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>Нема родендени во следните &lt;b&gt;%1&lt;/b&gt; денови!</translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>Следната годишнина е во &lt;b&gt;%1&lt;/b&gt; денови:</translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>Нема годишнини во следните &lt;b&gt;%1&lt;/b&gt; денови!</translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation>Базата на податоци не го овозможува ова пребарување! Надградете ги libOpie библиотеките! &lt;br&gt;</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/libtodaydatebookplugin.ts b/i18n/mk/libtodaydatebookplugin.ts
index afa4c98..ef30237 100644
--- a/i18n/mk/libtodaydatebookplugin.ts
+++ b/i18n/mk/libtodaydatebookplugin.ts
@@ -1,146 +1,87 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <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>
     </message>
     <message>
         <source>Show notes</source>
         <translation type="unfinished">Прилажи забелешки</translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
         <translation type="unfinished">Одблежи ако забелешката прикаченма за некој состаноок треба да биде прикажана за секој од нив</translation>
     </message>
     <message>
         <source>Show only later appointments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
         <translation type="unfinished">Одбери го ова само ако состаноците кои се закажани за подоцна треба да бидат покажани</translation>
     </message>
     <message>
         <source>Show time in extra line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
         <translation type="unfinished">Колку состаноци треба да бидат прикажани. Распоредени по време</translation>
     </message>
     <message>
         <source>How many appointment should be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>only today</source>
         <translation type="unfinished">само денес</translation>
     </message>
     <message>
         <source>How many more days should be in the range</source>
         <translation type="unfinished">Колку денови треба да бидат во опсегот</translation>
     </message>
     <message>
         <source>How many more days</source>
         <translation type="unfinished">Уште колку денови</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Datebook plugin</source>
         <translation>Додаток роковник</translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation>Денеска нема повеќе сеостаноци </translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation>Денеска нема состаноци</translation>
     </message>
 </context>
 </TS>
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
@@ -1,59 +1,40 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>Todolist plugin</source>
         <translation>додаток листа на задачи</translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation>Има &lt;b&gt;1&lt;/b&gt;активни задачи: &lt;br&gt;</translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation>Има &lt;b&gt;%1&lt;/b&gt;активни задачи: &lt;br&gt;</translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation>Нема активни задачи</translation>
     </message>
 </context>
 <context>
     <name>TodoPluginConfigBase</name>
     <message>
         <source>Set the maximum number of task that should be shown</source>
         <translation type="unfinished">Подеси го максимумот на зачи кои треба да бидат прикажани</translation>
     </message>
     <message>
         <source>tasks shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
         <translation type="unfinished">После колку карактери информацијата треба да се скрати</translation>
     </message>
     <message>
         <source>Clip line after X chars</source>
         <translation type="unfinished">Скрати ја линијата по Х карактеро</translation>
     </message>
 </context>
-<context>
-    <name>TodolistPluginConfig</name>
-    <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
@@ -1,121 +1,117 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>Weather plugin</source>
         <translation>Додаток за време</translation>
     </message>
 </context>
 <context>
     <name>WeatherPluginConfig</name>
     <message>
         <source>Enter ICAO location identifier:</source>
         <translation>Внеси идентификатор за локација:</translation>
     </message>
     <message>
         <source>Enter the 4 letter code for the desired location here.  See http://www.nws.noaa.gov/tg/siteloc.shtml to find a location near you.</source>
         <translation>Внеси код од 4 букви за локацијата. Погледајте на http://www.nws.noaa.gov/siteloc.shtml за да најдете локација блиску до вас.</translation>
     </message>
     <message>
         <source>Visit http://www.nws.noaa.gov/tg/siteloc.shtml to find the nearest location.</source>
         <translation>Погледајте на http://www.nws.noaa.gov/siteloc.shtml за да ја пронајдете најблиската локација.</translation>
     </message>
     <message>
         <source>Use metric units</source>
         <translation>Користи метрични единици</translation>
     </message>
     <message>
         <source>Click here to select type of units displayed.</source>
         <translation>Клики овде за да се избере типот на мерни единици.</translation>
     </message>
     <message>
         <source>Update frequency (in minutes):</source>
         <translation>Фрекфенција на освежување (во минути):</translation>
     </message>
     <message>
         <source>Select how often (in minutes) you want the weather to be updated.</source>
         <translation>Одберете колку често (во минути) податоците за времето да се освежуваат.</translation>
     </message>
 </context>
 <context>
     <name>WeatherPluginWidget</name>
     <message>
         <source>Retreiving current weather information.</source>
         <translation>Вчитување на информациите за моменталната состојба.</translation>
     </message>
     <message>
         <source>Temp: </source>
         <translation>Температура:</translation>
     </message>
     <message>
         <source>  Wind: </source>
         <translation>Ветер:</translation>
     </message>
     <message>
         <source>
 Pres: </source>
         <translation>
 Притисок:</translation>
     </message>
     <message>
         <source>Current weather data not available.</source>
         <translation>Податоците за моменталната состојба не се достапни.</translation>
     </message>
     <message>
         <source>n/a</source>
         <translation>н/а</translation>
     </message>
     <message>
         <source>E </source>
         <translation>И</translation>
     </message>
     <message>
         <source>NE </source>
         <translation>СИ</translation>
     </message>
     <message>
         <source>N </source>
         <translation>С</translation>
     </message>
     <message>
         <source>NW </source>
         <translation>СЗ</translation>
     </message>
     <message>
         <source>W </source>
         <translation>З</translation>
     </message>
     <message>
         <source>SW </source>
         <translation>ЈЗ</translation>
     </message>
     <message>
         <source>S </source>
         <translation>Ј</translation>
     </message>
     <message>
         <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
@@ -1,48 +1,36 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MindBreaker</name>
     <message>
         <source>New Game</source>
         <translation>Нова игра</translation>
     </message>
     <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>
         <source>Cancel</source>
         <translation>Откажи</translation>
     </message>
 </context>
 </TS>
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,37 +1,33 @@
 <!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>
         <source>Game</source>
         <translation>Игра</translation>
     </message>
     <message>
         <source>Mine Sweep</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,300 +1,328 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BaseSetup</name>
     <message>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slideshow timeout:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Toggle autoscale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to next image</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Delete Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Image Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></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>Browser Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Keyboard Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie Eye - Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Imageinfo Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Imageview Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Go dir up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start slideshow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and Imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show images fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto rotate images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show images unscaled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show zoomer window when unscaled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
     <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>
         <source>&lt;center&gt;&lt;b&gt;Be carefull with the following options!&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show files recursive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recursion depth:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Digital Camera View</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Name Only</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>imageinfo</name>
     <message>
         <source>View Full Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays an thumbnail of the image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays info of selected image</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,144 +1,123 @@
 <!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>
         <source>User</source>
         <translation>КОрисник</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Лозинка</translation>
     </message>
     <message>
         <source>Suspend</source>
         <translation>Суспензирај</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Мени</translation>
     </message>
 </context>
 <context>
     <name>LoginWindowImpl</name>
     <message>
         <source>Restart</source>
         <translation>Рестартирај</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>Изклучи</translation>
     </message>
     <message>
-        <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
-        <translation type="obsolete">&lt;center&gt;%1 %2&lt;/center&gt;</translation>
-    </message>
-    <message>
         <source>Wrong password</source>
         <translation>Погрешна лозинка</translation>
     </message>
     <message>
         <source>The given password is incorrect.</source>
         <translation>Внесената лозинка е неточна.</translation>
     </message>
     <message>
-        <source>OPIE was terminated
-by an uncaught signal
-(%1)
-</source>
-        <translation type="obsolete">OPIE беше исклучен
-од неозначен сигнал
-(%1)</translation>
-    </message>
-    <message>
         <source>Failure</source>
         <translation>Неуспех</translation>
     </message>
     <message>
-        <source>Could not start OPIE.</source>
-        <translation type="obsolete">Неможе да се стартува OPIE.</translation>
-    </message>
-    <message>
         <source>Could not switch to new user identity</source>
         <translation>Неможе да се префрли на нов идентитет на корисник</translation>
     </message>
     <message>
         <source>Opie was terminated
 by an uncaught signal
 (%1)
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not start Opie.</source>
         <translation type="unfinished"></translation>
     </message>
 </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>
     <message>
         <source>&lt;b&gt;Password:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Confirm:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PasswordDialogImpl</name>
     <message>
         <source>Trying to leave without password set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;No password was set. This could lead to you not beeingable to remotely connect to your machine.Do you want to continue not setting a password?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passwords don&apos;t match</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The two passwords don&apos;t match. Please try again.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password not legal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The entered password is not a valid password.Please try entering a valid password.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,817 +1,878 @@
 <!DOCTYPE TS><TS>
 <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>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerUI</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposeMail</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please create an SMTP account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a File.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Store message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Store message into drafts?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Attachments will not be stored in &quot;Draft&quot; folder&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Receiver specified</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposeMailUI</name>
     <message>
         <source>Compose Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>send later</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>use:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BCC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <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>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>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete the selected Account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select an account.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccountsUI</name>
     <message>
         <source>Configure Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>News</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IMAPconfigUI</name>
     <message>
         <source>Configure IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefix</source>
         <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>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>
     </message>
     <message>
         <source>Send queued mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show/Hide folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Newsgroups</source>
         <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>
     </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>
 <context>
     <name>NNTPconfigUI</name>
     <message>
         <source>Configure NNTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Newsgroup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get newsgroup list from server</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Newmdirdlgui</name>
     <message>
         <source>Enter directory name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directory name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directory contains other subdirs</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <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>
     </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>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></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>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec imapd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>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>
     </message>
     <message>
         <source>Use Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the SMTP Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port of the SMTP Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SelectMailTypeUI</name>
     <message>
         <source>Select Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Account Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>POP3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SMTP</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SettingsDialogUI</name>
     <message>
         <source>Settings Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View mail as Html</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compose Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mails later ( enqueue in outbox )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></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>
     </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>
     </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>
     </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>
     </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>
     </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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Store mail(s) to&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Folder:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create new folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefix will prepend, no need to enter it!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move mail(s)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,171 +1,131 @@
 <!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>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search for: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case sensitive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OListView</name>
     <message>
         <source>Results</source>
         <translation>Резултати</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <source>show completed tasks</source>
-        <translation 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>
         <source>open in filemanager</source>
         <translation>офтвори во управувач со датотеки</translation>
     </message>
     <message>
         <source>File: </source>
         <translation>Датотека:</translation>
     </message>
     <message>
         <source>Link: </source>
         <translation>Врска:</translation>
     </message>
     <message>
         <source>Mimetype: </source>
         <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>
         <source>Search in dates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search content</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,475 +1,463 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CalcDlg</name>
     <message>
         <source>Molecular Weight</source>
         <translation>Молекуларна тежина </translation>
     </message>
     <message>
         <source>Chemical Formula</source>
         <translation>Хемиска формула</translation>
     </message>
     <message>
         <source>Calculate</source>
         <translation>Израчунај</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>Исчисти</translation>
     </message>
     <message>
         <source>Molecular Weight (u):</source>
         <translation>Молекуларна тежина (u):</translation>
     </message>
     <message>
         <source>Elemental Composition (%):</source>
         <translation>Елементарни состојки (%):</translation>
     </message>
     <message>
         <source>CalcDlg</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OxydataWidget</name>
     <message>
         <source>%1 u</source>
         <translation>%1 u</translation>
     </message>
     <message>
         <source>%1 pm</source>
         <translation>%1 pm</translation>
     </message>
     <message>
         <source>%1 J</source>
         <translation>%1 J</translation>
     </message>
     <message>
         <source>%1 g/cm^3</source>
         <translation>%1 g/цм^3</translation>
     </message>
     <message>
         <source>%1 K</source>
         <translation>%1 K</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation>Тежина</translation>
     </message>
     <message>
         <source>Block</source>
         <translation>Блок</translation>
     </message>
     <message>
         <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>
 <context>
     <name>Oxygen</name>
     <message>
         <source>Oxygen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PSE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hydrogen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Helium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lithium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beryllium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Boron</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Carbon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nitrogen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fluorine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Neon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sodium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Magnesium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aluminum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Silicon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Phosphorus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sulfur</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chlorine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Argon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Potassium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calcium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scandium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Titanium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vanadium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chromium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manganese</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iron</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cobalt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copper</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zinc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gallium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Germanium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arsenic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selenium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bromine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Krypton</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rubidium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Strontium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yttrium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zirconium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niobium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Molybdenum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Technetium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ruthenium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rhodium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palladium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Silver</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cadmium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Indium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Antimony</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tellurium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iodine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Xenon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cesium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Barium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lanthanum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cerium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Praseodymium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Neodymium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Promethium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Samarium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Europium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gadolinium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terbium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dysprosium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Holmium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Erbium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thulium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ytterbium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lutetium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hafnium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tantalum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tungsten</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rhenium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Osmium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iridium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Platinum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mercury</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thallium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lead</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bismuth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Polonium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Astatine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Radon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Francium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Radium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Actinium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thorium</source>
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
@@ -1,97 +1,73 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CanvasCardWindow</name>
     <message>
         <source>Patience</source>
         <translation>Пасијанс</translation>
     </message>
     <message>
         <source>Freecell</source>
         <translation>Фрисел</translation>
     </message>
     <message>
         <source>Chicane</source>
         <translation>Чикане</translation>
     </message>
     <message>
         <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>
         <source>Snap to position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Turn one card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Turn three cards</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,592 +1,415 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished">Проблем со апликацијата</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;%1 не одговара&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Присилно да се иклучи апликацијата?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <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>
 <context>
     <name>FirstUse</name>
     <message>
         <source>&lt;&lt; Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next &gt;&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap anywhere on the screen to continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait, loading %1 settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finish</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputMethods</name>
     <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>
         <source>Documents</source>
         <translation type="unfinished">Документи</translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>Icon View</source>
         <translation type="unfinished">Преглед по икони</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished">Преглед по листа</translation>
     </message>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
-        <source>%1 files</source>
-        <translation type="obsolete">%1 датотеки</translation>
-    </message>
-    <message>
-        <source>All types of file</source>
-        <translation type="obsolete">Аите типови на датотека</translation>
-    </message>
-    <message>
         <source>Document View</source>
         <translation type="unfinished">Преглед на документи</translation>
     </message>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>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>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished">Сите</translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished">Слика</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished">Текст</translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished">Видео</translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished">Додај</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>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>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Server</name>
     <message>
         <source>USB Lock</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation type="unfinished">Информации</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Датумот на системот не е валиден.
 (%1)&lt;/p&gt;&lt;p&gt;Да се поправи саатот ? &lt;/p&gt;</translation>
     </message>
     <message>
-        <source>Battery level is critical!
-Keep power off until power restored!</source>
-        <translation type="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>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Critical Memory Shortage
 Please end this application
 immediately.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WARNING</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The battery is running very low. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The Back-up battery is very low&lt;p&gt;Please charge the back-up battery</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Shutdown...</source>
         <translation type="unfinished">Изгаси...</translation>
     </message>
     <message>
         <source>Terminate</source>
         <translation type="unfinished">Исклучи</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation type="unfinished">Исклучи Opie</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation type="unfinished">Рестартирај</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation type="unfinished">Рестартирај Opie</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation type="unfinished">Изгаси</translation>
     </message>
     <message>
-        <source>&lt;p&gt;
-These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
-        <translation type="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
@@ -1,396 +1,244 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoginBase</name>
     <message>
         <source>LoginBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you select this option, opie-login will automagically log you in with the user you have selected in the drop-down list.  
 
 For the Zaurus 5x00 this is always the user &quot;root&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This drop-down list allows you to select the user for auto-login
 (if enabled above).  
 
 You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MultiauthConfig</name>
     <message>
         <source>Security configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the order they will appear in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
         <source>Locking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></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-securityplugin-*&lt;/em&gt; package! Once you have done that, you will be able to configure your PDA protection here.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MultiauthGeneralConfig</name>
     <message>
         <source>When to lock Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on Opie start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on Opie resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Multiple plugins authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Required successes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Don&apos;t protect this config screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show explanatory screens</source>
         <translation type="unfinished"></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>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You must save your current settings before trying to authenticate. Press OK to accept and launch a simulated authentication process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you don&apos;t like the result of this test, don&apos;t forget to change your settings before you exit the configuration application!</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>
     </message>
     <message>
         <source>Select a net-range or enter a new one.  
 
 This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
 
 For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
 
 The entry &quot;All&quot; will allow *any* IP to connect. 
 The entry &quot;None&quot; will *deny* any connection.  
 
 If unsure, select &quot;Any&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the selected net range from the list
 
 If you press this button, the currently selected net range will be deleted from the list of net ranges.
 
 If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
 the list to the state it has been when you initially booted your Zaurus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button will restore the list of net ranges
 to the defaults.
 
 Beware that all manually entered net ranges will be lost!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select your sync software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Qtopia 1.7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie 1.0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IntelliSync</source>
         <translation type="unfinished"></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="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,50 +1,42 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>SnakeGame</name>
     <message>
         <source>Snake</source>
         <translation>Змија</translation>
     </message>
     <message>
         <source>New Game</source>
         <translation>Нова Игра</translation>
     </message>
     <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>КРАЈ!!! Резултат: %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
@@ -1,395 +1,357 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tests</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error</source>
         <translation type="unfinished"></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>Овој граф прикажува колку меморија се користи на оваа Flash картичка.</translation>
     </message>
     <message>
         <source>Ha</source>
         <translation>Ha</translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation>Овој граф прикажува колку простор има на дискот.</translation>
     </message>
     <message>
         <source>SD</source>
         <translation>SD</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation>Овој граф покажува колку меморија се користи на оваа SD картичка.</translation>
     </message>
     <message>
         <source>SC</source>
         <translation>SC</translation>
     </message>
     <message>
         <source>In</source>
         <translation>ln</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation>Овој граф прикажува колку се користи од вградената меморија на овој уред.</translation>
     </message>
     <message>
         <source>RA</source>
         <translation>RA</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation>Овој граф прикажува колку меморија се користи во привремениот RAM диск.</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Апликации на процесорот (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>Користење на системскиот процесор (%)</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Оваа страна поклажува колку од процесорот се користи.</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Тип:</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
-        <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
-Memory is categorized as follows:
-
-1. Used - memory used to by Opie and any running applications.
-2. Buffers - temporary storage used to improve performance
-3. Cached - information that has recently been used, but has not been freed yet.
-4. Free - memory not currently used by Opie or any running applications.</source>
-        <translation type="obsolete">Оваа страна покажува како меморијата се алоцира на овој уред,
-Меморијата се каратеризира според:
-
-1. Искористена - меморија која ја искоритуваат апликациите
-2. Бафери - привремени локации кои се користат за подобрување на перформансите
-3. Кеширани - информации кои биле скоро користени
-4. Слободна - меморија која не се користи.</translation>
-    </message>
-    <message>
         <source>Used (%1 kB)</source>
         <translation>Искористени (%1) кВ</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Бафери ( %1 кВ)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Кеширана (%1) кВ</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Слободна (%1 кВ)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Вкупно меморија: %1 кВ</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Модул</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Големина</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Искоритено#</translation>
     </message>
     <message>
-        <source>Used By</source>
-        <translation type="obsolete">Искористено од</translation>
-    </message>
-    <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>Ова е листа на сите вчитани модули на кернелот.
 
 Кликни и задржи на некој од модулите за да видиш додатни информации, или да го тргнеш.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Избери команда и кликни на копчето Прати за да се испрати до избраниот модул.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Прати</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Кликни овде за зибранта команда да се испрати наиззбраниот модул.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Овој дел прикажува детални информации за модулот.</translation>
     </message>
     <message>
-        <source>You really want to execute
-</source>
-        <translation type="obsolete">Да се изврши</translation>
-    </message>
-    <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>
         <source> : %1 kB</source>
         <translation>: %1 кВ</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Искористени (%1) кВ</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>Словофни (%1 кВ)</translation>
     </message>
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Команда</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Статус</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Време</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation>Ова е листа на сите провеси.
 
 Килкни и задржи на процес за додатни информации, или да испратиш сигнал.</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation>Избери сигнал и кликни на копчето Прати за да се испрати до процесот.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Прати</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation>Кликни овде за зибраниот сигнал да се испрати до процесот.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>Овде се прикажани деталн информации за процесот.</translation>
     </message>
     <message>
-        <source>You really want to send
-</source>
-        <translation type="obsolete">Да испрати</translation>
-    </message>
-    <message>
         <source>Really want to send %1
 to this process?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>Информации за ситемот</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Меморија</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Медиум</translation>
     </message>
     <message>
         <source>CPU</source>
         <translation>Процесор</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Процесс</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>Модули</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Верзија</translation>
     </message>
     <message>
         <source>Benchmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syslog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Кернел&lt;/b&gt;&lt;p&gt;Верзија:</translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Компајлирано од:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Оpie&lt;/b&gt;&lt;p&gt;Верзија:</translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Изградено на:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>&lt;p&gt; Верзија:</translation>
     </message>
     <message>
-        <source>&lt;p&gt;Model: </source>
-        <translation 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>
         <source>Built against Qt/E </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,69 +1,58 @@
 <!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>
     <message>
         <source>TableViewer - Edit Keys</source>
         <translation>Прегледувач на Табели - уреди клучеви</translation>
     </message>
     <message>
         <source>Key Name</source>
         <translation>Име на клуч</translation>
     </message>
     <message>
         <source>Key Type</source>
         <translation>Тип наклуч</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Ново</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Избриши</translation>
     </message>
     <message>
         <source>Clear All</source>
         <translation>Исчисти се</translation>
     </message>
 </context>
 <context>
     <name>TVListView</name>
     <message>
         <source>List View</source>
         <translation>Преглед на листа</translation>
     </message>
 </context>
 <context>
     <name>TableViewerWindow</name>
     <message>
         <source>Table Viewer</source>
         <translation>Прегледувач на табели</translation>
     </message>
     <message>
         <source>could not load Document</source>
         <translation>неможе да се вчита документот</translation>
     </message>
 </context>
 </TS>
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
@@ -1,194 +1,142 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <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>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>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation>Денес</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
         <translation>денес од Maximillian ReiB</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>Кликни овде за да се отвори прозорот за конфигурација</translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Today Config</source>
         <translation>Конфигурација</translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>Вчитај додатоци по редослед:</translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
         <translation>активирај/деактивирај додаток или користи ги стрелките за да се смени редоследод на прикажување</translation>
     </message>
     <message>
         <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>
         <translation type="unfinished">Избери ако „Денес“ треба автомтски да се стартува.</translation>
     </message>
     <message>
         <source>autostart on resume?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tiny banner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Have small banner </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
         <translation type="unfinished">Колку минути терминалот беше суспендиран пред модулот за авотстарт продолжил</translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation type="unfinished">минути неактивност</translation>
     </message>
     <message>
         <source> pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
         <translation type="unfinished">Намести големина на икони</translation>
     </message>
     <message>
         <source>icon size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> sec</source>
         <translation type="unfinished">сек</translation>
     </message>
     <message>
         <source>never</source>
         <translation type="unfinished">никогаш</translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
         <translation type="unfinished">Колку често треба „Денес“ да се освежува</translation>
     </message>
     <message>
         <source>refresh</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,648 +1,556 @@
 <!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>
 <context>
     <name>NewTaskDlg</name>
     <message>
         <source>New Task</source>
         <translation type="unfinished">Нова задала</translation>
     </message>
     <message>
         <source>Blank task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Using template:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Information</source>
         <translation>Информација</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Состојба</translation>
     </message>
     <message>
         <source>Alarms</source>
         <translation>Аларми</translation>
     </message>
     <message>
         <source>Recurrence</source>
         <translation>Повторување</translation>
     </message>
     <message>
         <source>Task Editor</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie</name>
     <message>
         <source>Todo List</source>
         <translation type="unfinished">Листа на задачи</translation>
     </message>
     <message>
         <source>Task</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
         <translation>Внеси задача</translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation>Уреди Задача</translation>
     </message>
     <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>
         <source>Remove</source>
         <translation>Одстрани</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Име</translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation>Нов поставка %1</translation>
     </message>
     <message>
         <source>Click here to set the priority of new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Кликни овде за да поставиш приоритет на нова задача.
 
 Овој простор дозволува набрзина да се внесе нова задача во листата.</translation>
     </message>
     <message>
         <source>Enter description of new task here.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Внеси опис за новата задача.
 
 Овој простор дозволува набрзина да се внесе нова задача во листата.</translation>
     </message>
     <message>
         <source>More</source>
         <translation>Повеќе</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>Кликни овде за да се внесат додатни информации за новата задача.
 
 Овој простор дозволува набрзина да се внесе нова задача во листата.</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Внеси</translation>
     </message>
     <message>
         <source>Click here to add new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Додади опис новата задача.
 
 Овој простор дозволува набрзина да се внесе нова задача во листата.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Откажи</translation>
     </message>
     <message>
         <source>Click here to reset new task information.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Кликни овде да ресетираш информации за нова задача.
 
 Овој простор дозволува набрзина да се внесе нова задача во листата.</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Приоритет:</translation>
     </message>
     <message>
         <source>Data can not be edited, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data can&apos;t be edited, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>Table View</source>
         <translation>Преглед по табела</translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation>%1 ден</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ништо</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>Date</source>
         <translation>Датум</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Време</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Нов</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Уреди</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Избриши</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Description:</source>
         <translation>Опис:</translation>
     </message>
     <message>
         <source>Enter brief description of the task here.</source>
         <translation>Внеси краток опис на задачата овде.</translation>
     </message>
     <message>
         <source>Complete </source>
         <translation>Заврши</translation>
     </message>
     <message>
         <source>Work on </source>
         <translation>Работи на</translation>
     </message>
     <message>
         <source>Buy </source>
         <translation>Купи</translation>
     </message>
     <message>
         <source>Organize </source>
         <translation>Организирај</translation>
     </message>
     <message>
         <source>Get </source>
         <translation>Земи</translation>
     </message>
     <message>
         <source>Update </source>
         <translation>Ажурирај</translation>
     </message>
     <message>
         <source>Create </source>
         <translation>Создади</translation>
     </message>
     <message>
         <source>Plan </source>
         <translation>План</translation>
     </message>
     <message>
         <source>Call </source>
         <translation>Повикај</translation>
     </message>
     <message>
         <source>Mail </source>
         <translation>Електронско писмо</translation>
     </message>
     <message>
         <source>Select priority of task here.</source>
         <translation>Избери приоритет на задача.</translation>
     </message>
     <message>
         <source>Very High</source>
         <translation>Многу Висок</translation>
     </message>
     <message>
         <source>High</source>
         <translation>ВИсока</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Нормална</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Ниска</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>Многу Низок</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Категорија:</translation>
     </message>
     <message>
         <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>
 <context>
     <name>TaskEditorStatus</name>
     <message>
         <source>Status:</source>
         <translation>Статус:</translation>
     </message>
     <message>
         <source>Click here to set the current status of this task.</source>
         <translation>Моментална состојба на задачата.</translation>
     </message>
     <message>
         <source>Started</source>
         <translation>Почнат</translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation>Одложено</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>Завршен</translation>
     </message>
     <message>
         <source>Not started</source>
         <translation>Не е почнат</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Напредок:</translation>
     </message>
     <message>
         <source>Select progress made on this task here.</source>
         <translation>Избери ниво на напредок.</translation>
     </message>
     <message>
         <source>0 %</source>
         <translation>0 %</translation>
     </message>
     <message>
         <source>20 %</source>
         <translation>20 %</translation>
     </message>
     <message>
         <source>40 %</source>
         <translation>40 %</translation>
     </message>
     <message>
         <source>60 %</source>
         <translation>60 %</translation>
     </message>
     <message>
         <source>80 %</source>
         <translation>80 %</translation>
     </message>
     <message>
         <source>100 %</source>
         <translation>100 %</translation>
     </message>
     <message>
         <source>Start Date:</source>
         <translation>Почетен датум:</translation>
     </message>
     <message>
         <source>Click here to set the date this task was started.</source>
         <translation>Намести датум кога е започната задачата.</translation>
     </message>
     <message>
         <source>Due Date:</source>
         <translation>Краен рок:</translation>
     </message>
     <message>
         <source>Click here to set the date this task needs to be completed by.</source>
         <translation>Краен рок.</translation>
     </message>
     <message>
         <source>Completed:</source>
         <translation>Завршено:</translation>
     </message>
     <message>
         <source>Click here to mark this task as completed.</source>
         <translation>Означи ја задачата како завршена.</translation>
     </message>
     <message>
         <source>Click here to set the date this task was completed.</source>
         <translation>Намести го датумот на завршување на задачата.</translation>
     </message>
     <message>
         <source>Maintainer Mode:</source>
         <translation>МОд на одржување:</translation>
     </message>
     <message>
         <source>Click here to set the maintainer&apos;s role.</source>
         <translation>Намести ја улогатана одржувачот.</translation>
     </message>
     <message>
         <source>Nothing</source>
         <translation>Ништо</translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation>Одговорен</translation>
     </message>
     <message>
         <source>Done By</source>
         <translation>Завршен од</translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation>Координирање</translation>
     </message>
     <message>
         <source>Maintainer:</source>
         <translation>Одржувач:</translation>
     </message>
     <message>
         <source>This is the name of the current task maintainer.</source>
         <translation>Име на раководителот на проектот.</translation>
     </message>
     <message>
         <source>test</source>
         <translation>тест</translation>
     </message>
     <message>
         <source>Click here to select the task maintainer.</source>
         <translation>Избери одржувач на задачата.</translation>
     </message>
 </context>
 </TS>
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
@@ -1,35 +1,31 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GroupDialog</name>
     <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>
         <translation>уреди Корисник</translation>
     </message>
 </context>
 </TS>
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,832 +1,566 @@
 <!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>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <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>
         <source>&amp;Import text file</source>
         <translation>Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
         <translation>Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
         <translation>&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation 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>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation 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>
         <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
         <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
         <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
         <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
         <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
         <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
         <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
         <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
         <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
         <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
         <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
         <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
         <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
         <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
         <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
         <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
-        <source>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>
         <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No document defined.
 You have to create a new document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to save </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 before continuing?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Now you have to enter
 a password twice for your
 newly created document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&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>
         <source>&lt;P&gt;You must create a new document first. Ok to create?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Password Manager&lt;br&gt;ZSafe version 2.1.2&lt;br&gt;&lt;/b&gt;by Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Translations by Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,569 +1,483 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation>Volledige naam</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Contact</translation>
     </message>
     <message>
         <source>Pick</source>
         <translation>Kies</translation>
     </message>
 </context>
 <context>
     <name>AbView</name>
     <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>
         <source>Edit Contact</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation>Verzoekstijl</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>Gebruik reguliere expressies</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>Gebruik jokertekens (*,?)</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Hoofdlettergevoelig</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Mail</translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation>Gebruik QT-Mail</translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation>Gebruik Opie-Mail</translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation>Opmerking: QT-Mail is
 alleen voorhanden in de
 SHARP standaard ROM.
 Opie-Mail wordt gratis
 geleverd!</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Divers</translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation>Zoekopties</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Lettertype</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Klein</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normaal</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Groot</translation>
     </message>
     <message>
         <source>Order</source>
         <translation>Volgorde</translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation>Kies contactvolgorde:</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Omhoog</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Omlaag</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Voeg toe</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation>Configuratie</translation>
     </message>
     <message>
         <source>Click on tab to select one</source>
         <translation>Klik op tab om te selecteren</translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation>Opties voor de zoekstijl</translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation>Zoekelement verwacht reguliere expressies als die zijn geselecteerd</translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
         <translation>Zoekelement verwacht alleen jokertekens</translation>
     </message>
     <message>
         <source>If selected, search differs between upper and lower chars</source>
         <translation>Indien geselecteerd, hoofdlettergevoelig</translation>
     </message>
     <message>
         <source>Font size for list- and card view</source>
         <translation>Fontgrootte voor lijst- en kaartweergave</translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
         <translation>Fontsettings voor lijst- en kaartweergave</translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation>Gebruik Sharp&apos;s mailprogramma indien beschikbaar</translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</source>
         <translation>Gebruik Opie mail indien geinstalleerd</translation>
     </message>
     <message>
         <source>Move selected attribute one line up</source>
         <translation>Verplaats geselecteerd kenmerk een plaats omhoog</translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation>Verplaats geselecteerd kenmerk een plaats omlaag</translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation>Lijst van alle mogelijke kenmerken</translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation>Voeg geselecteerd kenmerk toe van onderstaande lijst aan de bovenste lijst </translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation>Verwijder geselecteerd kenmerk uit de bovenste lijst</translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation>Volgorde (op -&gt; neer) regelt wat het eerst wordt weergegeven in de tweede kolom in de lijstweergave</translation>
     </message>
     <message>
         <source>Tool-/Menubar</source>
         <translation>Gereedschap-/Menubalk</translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation>Vast</translation>
     </message>
     <message>
         <source>Switch to fixed menu-/toolbars after restarting application !</source>
         <translation>Schakel over naar vaste gereedschap-/menubalk na het wisselen van programma!</translation>
     </message>
     <message>
         <source>Moveable</source>
         <translation>Verplaatsbaar</translation>
     </message>
     <message>
         <source>Switch to moveable menu-/toolbars after restarting application !</source>
         <translation>Schakel over naar verplaatsbare gereedschap-/menubalk na het wisselen van programma!</translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>First Name</source>
         <translation>Voornaam</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Tussenvoegsel</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Achternaam</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Toevoeging</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Sla op als</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Geslacht</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Functie</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Woonplaats</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Provincie</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>Land</translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation>Volledige naam...</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Organisatie</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Categorie</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Notities</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Algemeen</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Werk</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Privé</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Adres</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>Postcode</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>Verenigde Staten</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Verenigd Koninkrijk</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>Japan</translation>
     </message>
     <message>
         <source>France</source>
         <translation>Frankrijk</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>Duitsland</translation>
     </message>
     <message>
         <source>Norway</source>
         <translation>Noorwegen</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>Canada</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Man</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Vrouw</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Details</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>Maak notitie</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>Wijzig naam</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Contacten</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation>Albanië</translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation>Algerije</translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation>Amerikaans Samoa</translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation>Andorra</translation>
     </message>
     <message>
         <source>Angola</source>
         <translation>Angola</translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation>Anguilla</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>Argentinië</translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation>Aruba</translation>
     </message>
     <message>
         <source>Australia</source>
         <translation>Australië</translation>
     </message>
     <message>
         <source>Austria</source>
         <translation>Oostenrijk</translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation>Azerbeidzjan</translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation>Bahama&apos;s</translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation>Bahrein</translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation>Bangladesh</translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation>Barbados</translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation>Belarus</translation>
     </message>
@@ -1018,552 +932,385 @@ geleverd!</translation>
     <message>
         <source>Oman</source>
         <translation>Oman</translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation>Pakistan</translation>
     </message>
     <message>
         <source>Palau</source>
         <translation>Palau</translation>
     </message>
     <message>
         <source>Panama</source>
         <translation>Panama</translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation>Papua Nieuw Guinea</translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation>Paraguay</translation>
     </message>
     <message>
         <source>Peru</source>
         <translation>Peru</translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation>Fillipijnen</translation>
     </message>
     <message>
         <source>Poland</source>
         <translation>Polen</translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation>Portugal</translation>
     </message>
     <message>
         <source>Puerto Rico</source>
         <translation>Puerto Rico</translation>
     </message>
     <message>
         <source>Qatar</source>
         <translation>Quatar</translation>
     </message>
     <message>
         <source>Reunion</source>
         <translation>Reunion</translation>
     </message>
     <message>
         <source>Romania</source>
         <translation>Roemenië</translation>
     </message>
     <message>
         <source>Russia</source>
         <translation>Rusland</translation>
     </message>
     <message>
         <source>Rwanda</source>
         <translation>Ruanda</translation>
     </message>
     <message>
         <source>Saint Lucia</source>
         <translation>Santa Lucia</translation>
     </message>
     <message>
         <source>Samoa</source>
         <translation>Samoa</translation>
     </message>
     <message>
         <source>San Marino</source>
         <translation>San Marino</translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
         <translation>Saudi Arabië</translation>
     </message>
     <message>
         <source>Senegal</source>
         <translation>Senegal</translation>
     </message>
     <message>
         <source>Seychelles</source>
         <translation>Seychellen</translation>
     </message>
     <message>
         <source>Sierra Leone</source>
         <translation>Sierra Leone</translation>
     </message>
     <message>
         <source>Singapore</source>
         <translation>Singapore</translation>
     </message>
     <message>
         <source>Slovakia</source>
         <translation>Slowakijë</translation>
     </message>
     <message>
         <source>Slovenia</source>
         <translation>Slovenië</translation>
     </message>
     <message>
         <source>Solomon Islands</source>
         <translation>Solomon Eilanden</translation>
     </message>
     <message>
         <source>Somalia</source>
         <translation>Somalië</translation>
     </message>
     <message>
         <source>South Africa</source>
         <translation>Zuid-Afrika</translation>
     </message>
     <message>
         <source>Spain</source>
         <translation>Spanje</translation>
     </message>
     <message>
         <source>Sri Lanka</source>
         <translation>Sri Lanka</translation>
     </message>
     <message>
         <source>St. Helena</source>
         <translation>St. Helena</translation>
     </message>
     <message>
         <source>Sudan</source>
         <translation>Sudan</translation>
     </message>
     <message>
         <source>Suriname</source>
         <translation>Suriname</translation>
     </message>
     <message>
         <source>Swaziland</source>
         <translation>Swaziland</translation>
     </message>
     <message>
         <source>Sweden</source>
         <translation>Zweden</translation>
     </message>
     <message>
         <source>Switzerland</source>
         <translation>Zwitserland</translation>
     </message>
     <message>
         <source>Taiwan</source>
         <translation>Taiwan</translation>
     </message>
     <message>
         <source>Tajikistan</source>
         <translation>Tajikistan</translation>
     </message>
     <message>
         <source>Tanzania</source>
         <translation>Tanzania</translation>
     </message>
     <message>
         <source>Thailand</source>
         <translation>Thailand</translation>
     </message>
     <message>
         <source>Togo</source>
         <translation>Togo</translation>
     </message>
     <message>
         <source>Tokelau</source>
         <translation>Tokelau</translation>
     </message>
     <message>
         <source>Tonga</source>
         <translation>Tonga</translation>
     </message>
     <message>
         <source>Tunisia</source>
         <translation>Tunesië</translation>
     </message>
     <message>
         <source>Turkey</source>
         <translation>Turkije</translation>
     </message>
     <message>
         <source>Turkmenistan</source>
         <translation>Turkmenistan</translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation>Tuvalu</translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation>Uganda</translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation>Oekraine</translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation>Uruguay</translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation>Oezbekistan</translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation>Vanuatu</translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation>Venezuela</translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation>Maagdeneilanden</translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation>Westelijke Sahara</translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation>Jemen</translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation>Joegoslavië</translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation>Zambia</translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation>Zimbabwe</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Verjaardag</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Jaardag</translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation>Koeweit</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Onbekend</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <source>Afghanistan</source>
         <translation>Afghanistan</translation>
     </message>
     <message>
         <source>Antarctica</source>
         <translation>Antartica</translation>
     </message>
     <message>
         <source>Armenia</source>
         <translation>Armenië</translation>
     </message>
     <message>
         <source>Bolivia</source>
         <translation>Bolivia</translation>
     </message>
     <message>
         <source>Cameroon</source>
         <translation>Kameroen</translation>
     </message>
     <message>
         <source>Ghana</source>
         <translation>Ghana</translation>
     </message>
     <message>
         <source>Guadeloupe</source>
         <translation>Guadeloupe</translation>
     </message>
     <message>
         <source>Guinea-Bissau</source>
         <translation>Guinee-Bissau</translation>
     </message>
     <message>
         <source>Jamaica</source>
         <translation>Jamaica</translation>
     </message>
     <message>
         <source>Kiribati</source>
         <translation>Kiribati</translation>
     </message>
     <message>
         <source>Kyrgyzstan</source>
         <translation>Kirgyzstan</translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
         <translation>Palestijnse autonome gebieden</translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
         <translation>Pitcairn Eilanden</translation>
     </message>
     <message>
         <source>Vietnam</source>
         <translation>Vietnam</translation>
     </message>
     <message>
         <source>Press to enter last- middle and firstname</source>
         <translation>Druk hier om volledige naam in te vullen</translation>
     </message>
     <message>
         <source>Enter fullname directly ! If you have a lastname with multiple words ( for instance &quot;de la Guerra&quot;), please write &lt;lastname&gt;,&lt;firstnames&gt; like this: &quot;de la Guerra, Carlos Pedro&quot;</source>
         <translation>Vul de hele naam direct in! Als een achternaam met meerdere woorden moet worden ingevuld (bijvoorbeeld &quot;de Vries&quot;), schrijf dan &lt;achternaam&gt;, &lt;voornamen&gt; zoals dit: &quot;de Vries, Peter Paul&quot;</translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation>De functienaam..</translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation>Iets als &quot;jr.&quot;..</translation>
     </message>
     <message>
         <source>The working place of the contact</source>
         <translation>De plaats waar het contact werkt</translation>
     </message>
     <message>
         <source>Press to select attribute to change</source>
         <translation>Druk om het te veranderen kenmerk te selecteren</translation>
     </message>
     <message>
         <source>Press to select how to store the name (and howto show it in the listview)</source>
         <translation>Druk hier om te selecteren hoe de naam opgeslagen(en weergegeven in de lijst) moet worden</translation>
     </message>
     <message>
         <source></source>
         <translation></translation>
     </message>
 </context>
 <context>
     <name>Opie</name>
     <message>
         <source>Contact</source>
         <translation type="unfinished">Contact</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation type="unfinished">Contacten</translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation type="unfinished">Start zoeken</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation type="unfinished">Schrijf mail aan</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation type="unfinished">Importeer vCard</translation>
     </message>
     <message>
         <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,452 +1,361 @@
 <!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>
         <source>Open as text</source>
         <translation>Open als tekst</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Akties</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>Maak map</translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation>Maak symbolische link</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Hernoem</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Kopiëer</translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation>Kopiëer als</translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation>Kopiëer in zelfde map</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>Verplaats</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation>Voeg toe aan Documenten</translation>
     </message>
     <message>
         <source>Run Command</source>
         <translation>Voer commando uit</translation>
     </message>
     <message>
         <source>File Info</source>
         <translation>Bestandsinfo</translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation>Stel bevoegdheden in</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Eigenschappen</translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation>Verzend bestand via IR</translation>
     </message>
     <message>
         <source>AdvancedFm</source>
         <translation>AdvancedFm</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Bestand</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Bekijk</translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation>Voer commando uit met uitvoer</translation>
     </message>
     <message>
         <source>Select All</source>
         <translation>Selecteer alles</translation>
     </message>
     <message>
         <source>Bookmark Directory</source>
         <translation>Maak favoriet van map</translation>
     </message>
     <message>
         <source>Remove Current Directory from Bookmarks</source>
         <translation>Verwijder huidige map uit favorieten</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Grootte</translation>
     </message>
     <message>
         <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>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
         <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>
         <source>Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1 files?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1 and all it&apos;s contents?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really copy %1 files?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 already  exists. Ok to overwrite?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Could not copy %1 to %2&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy %1 As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt; %1 already exists. Ok to overwrite?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not copy %1 to %2&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt; %1 already exists. Do you really want to delete it?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not move %1&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not copy %1 to %2&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Output</source>
         <translation>Uitvoer</translation>
     </message>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Sla uivoer op in bestand (alleen bestandsnaam)</translation>
     </message>
     <message>
         <source>Process could not start</source>
         <translation>Proces kon niet worden gestart</translation>
     </message>
     <message>
         <source>Error
 </source>
         <translation>Fout
 </translation>
     </message>
     <message>
         <source>
 Finished
 </source>
         <translation>
 Klaar
 </translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Stel bestandspermissies in</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Stel bestandspermissies in voor:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>eigenaar</translation>
     </message>
     <message>
         <source>group</source>
         <translation>groep</translation>
     </message>
     <message>
         <source>others</source>
         <translation>iedereen</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Eigenaar</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Groep</translation>
     </message>
     <message>
         <source>read</source>
         <translation>Lezen</translation>
     </message>
     <message>
         <source>write</source>
         <translation>Schrijven</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>Uitvoeren</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Waarschuwing</translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation>Fout - geen gebruiker</translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation>Fout - geen groep</translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation>Fout bij instellen van eigenaar of groep</translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation>Fout bij instellen modus</translation>
     </message>
     <message>
         <source>filePermissions</source>
         <translation>bestandspermissies</translation>
     </message>
 </context>
 </TS>
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
@@ -1,293 +1,233 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Appearance</name>
     <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>Stijlen regelen de manier waarop knoppen en schuifbalken in alle programma&apos;s worden weergegeven.
 
 Klik hier om een stijl te selecteren.</translation>
     </message>
     <message>
         <source>Settings...</source>
         <translation>Instellingen...</translation>
     </message>
     <message>
         <source>Click here to configure the currently selected style.
 
 Note:  This option is not available for all styles.</source>
         <translation>Klik hier om de momenteel geselecteerde stijl in te stellen.
 
 Let op: Deze optie is niet beschikbaar voor alle stijlen.</translation>
     </message>
     <message>
         <source>Window decorations control the way the application title bar and its buttons appear.
 
 Click here to select an available decoration.</source>
         <translation>Vensterdecoratie verzorgt de manier waarop de titelbalk en knoppen van een programma
 worden weergegeven.
 Klik hier om een beschikbare decoratie te kiezen.</translation>
     </message>
     <message>
         <source>Select the desired name, style and size of the default font applications will use.</source>
         <translation>Selecteer het gewenste font, stijl en tekengrootte dat standaard moet worden gebruikt.</translation>
     </message>
     <message>
         <source>Color schemes are a collection of colors which are used for various parts of the display.
 
 Click here to select an available scheme.</source>
         <translation>Kleurschema&apos;s zijn een set kleuren die worden gebruikt door de diverse delen van het scherm.
 
 Klik hier om een kleurschema te kiezen.</translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation>Huidig schema</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>Pas aan....</translation>
     </message>
     <message>
         <source>Click here to change the colors in the current color scheme.</source>
         <translation>Klik hier om de kleuren in het huidige schema te wijzigen.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <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:
 
 1. Tabbladen - Normale tabbladen met alleen tekstlabels
 2. Tabbladen met iconen - Tabbladen met iconen voor ieder tabblad, tekst verschijnt alleen bij huidig tabblad.
 3. Keuzelijst - Een verticale opsomming van de bladen
 4. Keuzelijst met iconen - Een verticale opsomming van de bladen met iconen</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Tabbladen</translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
         <translation>Tabbladen met Iconen</translation>
     </message>
     <message>
         <source>Drop down list</source>
         <translation>Keuzelijst</translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation>Keuzelijst met iconen</translation>
     </message>
     <message>
         <source>Top</source>
         <translation>Boven</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation>Klik hier om tabs bovenaan het scherm te plaatsen.</translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation>Onder</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation>Klik hier om tabs onderaan het scherm te plaatsen.</translation>
     </message>
     <message>
         <source>Rotation direction:</source>
         <translation>Rotatierichting:</translation>
     </message>
     <message>
         <source>Appearance Settings</source>
         <translation>Weergaveinstellingen</translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation>Dit is een voorbeeldvenster. Kijk hier om te zien hoe de weergave verandert als instellingen worden gewijzigd.</translation>
     </message>
     <message>
         <source>Style</source>
         <translation>Stijl</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Lettertype</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Kleuren</translation>
     </message>
     <message>
         <source>Windows</source>
         <translation>Vensters</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Gevorderd</translation>
     </message>
     <message>
-        <source>Restart</source>
-        <translation 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>
         <translation>Wijzig schema</translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation>Klik hier om een kleur te kiezen voor:</translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
         <translation>Voorbeeld</translation>
     </message>
     <message>
         <source>Normal Item</source>
         <translation>Normaal item</translation>
     </message>
     <message>
         <source>Disabled Item</source>
         <translation>Uitgeschakeld Item</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Menu</translation>
     </message>
     <message>
         <source>Normal Text</source>
         <translation>Normale tekst</translation>
     </message>
     <message>
         <source>Highlighted Text</source>
         <translation>Gemakeerde tekst</translation>
     </message>
     <message>
         <source>Button</source>
         <translation>Knop</translation>
     </message>
     <message>
         <source>Check Box</source>
         <translation>Selectievakje</translation>
     </message>
     <message>
         <source>Sample window using the selected settings.</source>
         <translation>Voorbeeldvenster met de geselecteerde instellingen.</translation>
     </message>
 </context>
 </TS>
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
@@ -1,710 +1,670 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation>Kategoriefilter</translation>
     </message>
     <message>
         <source>Select one or more groups</source>
         <translation>Selecteer een of meer groepen</translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation>Lees Configuratie....</translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Annuleer</translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Remove
 </source>
         <translation>Verwijder
 </translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation>Installeer</translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation>Vernieuw
 </translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation>(Herinstallatie)</translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation>(Vernieuw)</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation>Doel</translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation>Beschikbare ruimte</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Uitvoer</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Start</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opties</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Tekst</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation>Afbreken</translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation>
 **** Gebruiker drukte op AFBREKEN ****</translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation>**** Bewerking Afgebroken ****</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Sluit</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Onbekend</translation>
     </message>
     <message>
         <source>Save output</source>
         <translation>Sla utivoer op</translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation>%1 kB</translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation>Opties</translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation>Forceer Afhankelijkheden</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation>Forceer Herinstallatie</translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation>Forceer Verwijderen</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation>Forceer Overschrijven</translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation>Informatieniveau</translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation>Alleen Fouten</translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation>Normale berichten</translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation>Informatieve berichten</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation>Foutopsporingsuitvoer</translation>
     </message>
 </context>
 <context>
     <name>Ipkg</name>
     <message>
         <source>Dealing with package %1</source>
         <translation>Verwerken van pakket %1</translation>
     </message>
     <message>
         <source>Removing symbolic links...
 </source>
         <translation>Verwijderen van symbolysche links...
 </translation>
     </message>
     <message>
         <source>Creating symbolic links for %1.</source>
         <translation>Maak symbolische links aan voor %1.</translation>
     </message>
     <message>
         <source>Creating symbolic links for %1</source>
         <translation>Maak symbolische links aan voor %1</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>Klaar</translation>
     </message>
     <message>
         <source>Removing status entry...</source>
         <translation>Verwijder status info...</translation>
     </message>
     <message>
         <source>status file - </source>
         <translation>statusbestand - </translation>
     </message>
     <message>
         <source>package - </source>
         <translation>pakket - </translation>
     </message>
     <message>
         <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>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation>AQPkg - Pakketmanager</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation>Typ hier de te zoeken tekst.</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation>Klik hier on de Quick Jump werkbalk te verbergen.</translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation>Vernieuw lijsten</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation>Klik hier om de pakketlijsten van de server te vernieuwen.</translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation>Upgrade</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation>Klik hier om alle geinstaleerde pakketten te vernieuwen als er een nieuwere versie is.</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Download</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation>Klik hier on de momenteel geselecteerde pakketten op te halen.</translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation>Voer uit</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation>Klik hier om de momenteel geselecteerde pakketten te installeren, verwijderen of vernieuwen.</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Stel in</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation>Klik hier om dit programma in te stellen.</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Akties</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation>Laat niet geinstalleerde paketten zien</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation>Klik hier om beschikbare pakketten te laten zien die niet geinstallerd zijn.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation>Laat geinstalleerde paketten zien</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation>Klik hier om de momenteel geinstalleerde paketten te zien.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation>Laat vernieuwde paketten zien</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation>Klik hier om geinstalleerde pakketten te laten zien waar een nieuwere versie van beschikbaar is.</translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation>Filter op kategorie</translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation>Klik hier om paketten te laten zien die tot een kategorie behoren.</translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation>Stel kategoriefilter in</translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation>Klik hier om pakket-filtercategorie te wijzigen.</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Vind</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation>Klik hier om te zoeken op tekst in pakketnamen.</translation>
     </message>
     <message>
         <source>Find next</source>
         <translation>Vind volgende</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation>Klik hier om het volgende pakket te zoeken die aan de zoektekst voldoet.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation>Quick Jump toetsenblok</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation>Klik hier om het toetsenblok te laten zien/verbergen om snelle toegang tot de pakketlijst mogelijk te maken. </translation>
     </message>
     <message>
         <source>View</source>
         <translation>Aanzicht</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation>Klik hier om de zoekbalk te verbergen.</translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation>Servers:</translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation>Klik hietr om een pakketbron te kiezen.</translation>
     </message>
     <message>
         <source>Packages</source>
         <translation>Pakketten</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 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>Dit is een lijst met alle paketten van de bovenstaande server.
 
 Een blauw bolletje naast de naam geeft aan dat het pakket momenteel is geinstalleerd.
 
 Een blauw bolletje met een ster geeft aan dat er een nieuwere versie van dit pakket beschikbaar is.
 
 Vink het vakje aan de linkerkant aan om een pakket te selecteren.</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation>Klik hier om de momenteel geselecteerde paketten te verwijderen.</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation>Bouw serverlijst op:
 %1</translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation>Bouw serverlijst op voor:
 %1</translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
         <translation>Ververs serverpakketlijsten</translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation>WAARSCHUWING: Upgraden
 terwijl Opie/Qtopia draait
 is NIET aanbevolen!
 
 Weet u het zeker?
 </translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Waarschuwing</translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
         <translation>Vernieuwen geinstalleerde paketten</translation>
     </message>
     <message>
         <source>Are you sure you wish to delete
 %1?</source>
         <translation>Bent u zeker van het verwijderen van
 pakket %1?</translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation>Weet u het zeker?</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nee</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
         <source>Download to where</source>
         <translation>Waarheen downloaden</translation>
     </message>
     <message>
         <source>Enter path to download to</source>
         <translation>Vul pad om naartoe te downloaden in</translation>
     </message>
     <message>
         <source>Install Remote Package</source>
         <translation>Installeer pakket van server</translation>
     </message>
     <message>
         <source>Enter package location</source>
         <translation>Voer pakketlocatie in</translation>
     </message>
     <message>
         <source>Nothing to do</source>
         <translation>Niets te doen</translation>
     </message>
     <message>
         <source>No packages selected</source>
         <translation>Geen pakketten geselecteerd</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Do you wish to remove or reinstall
 %1?</source>
         <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>
         <translation>&lt;p&gt;&lt;b&gt;Geinstalleerd naar&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Grootte&lt;/b&gt; -</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Sectie&lt;/b&gt; -</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Bestandsnaam&lt;/b&gt; -</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Geinstalleerde versie&lt;/b&gt; -</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Beschikbare versie&lt;/b&gt; -</translation>
     </message>
     <message>
         <source>Package Information</source>
         <translation>Pakketinformatie</translation>
     </message>
     <message>
         <source>Package information is unavailable</source>
         <translation>Pakketinformatie is niet beschikbaar</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Sluit</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Installed packages</source>
         <translation>Geinstalleerde pakketten</translation>
     </message>
     <message>
         <source>Local packages</source>
         <translation>Lokale pakketten</translation>
     </message>
     <message>
         <source>N/A</source>
         <translation>n/b</translation>
     </message>
     <message>
         <source>Package - %1
               version - %2</source>
         <translation>Pakket - %1
             versie - %2</translation>
     </message>
     <message>
         <source>
               inst version - %1</source>
         <translation>
             inst versie - %1</translation>
     </message>
     <message>
         <source>Version string is empty.</source>
         <translation>Versiestring is leeg.</translation>
     </message>
     <message>
         <source>Epoch in version is not number.</source>
         <translation>Tekst in versie is geen nummer.</translation>
     </message>
     <message>
         <source>Nothing after colon in version number.</source>
         <translation>Geen versienummer na de punt.</translation>
     </message>
 </context>
 <context>
     <name>QuestionDlg</name>
     <message>
         <source>Remove</source>
         <translation>Verwijder</translation>
     </message>
 </context>
 <context>
     <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation>Instellingen</translation>
     </message>
     <message>
         <source>Servers</source>
         <translation>Servers</translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation>Doelen</translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation>Proxies</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nieuw</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Naam:</translation>
     </message>
     <message>
         <source>Address:</source>
         <translation>Adres:</translation>
     </message>
     <message>
         <source>Active Server</source>
         <translation>Aktieve Server</translation>
     </message>
     <message>
         <source>Update</source>
         <translation>Vernieuw</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation>Doel</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Locatie:</translation>
     </message>
     <message>
         <source>Link to root</source>
         <translation>Link naar Root</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
         <translation>HTTP Proxy</translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation>Ingeschakeld</translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation>FTP Proxy</translation>
     </message>
     <message>
         <source>Username:</source>
         <translation>Gebruikersnaam:</translation>
     </message>
     <message>
         <source>Password:</source>
         <translation>Wachtwoord:</translation>
     </message>
 </context>
 </TS>
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,169 +1,149 @@
 <!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>
     </message>
     <message>
         <source>Backup Failed!</source>
         <translation>Backup mislukt!</translation>
     </message>
     <message>
         <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>
         <source>Restore Backup...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;%1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore</source>
         <translation type="unfinished">Herstel</translation>
     </message>
     <message>
         <source>Would you really overwrite your local data?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <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>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ErrorDialog</name>
     <message>
         <source>Error Info</source>
         <translation>Foutinformatie</translation>
     </message>
     <message>
         <source>Error Message:</source>
         <translation>Foutomschrijving:</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;Ok</translation>
     </message>
 </context>
 </TS>
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,339 +1,331 @@
 <!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>
         <source>CE</source>
         <translation>CE</translation>
     </message>
     <message>
         <source>log</source>
         <translation>log</translation>
     </message>
     <message>
         <source>ln</source>
         <translation>ln</translation>
     </message>
     <message>
         <source>(</source>
         <translation>(</translation>
     </message>
     <message>
         <source>)</source>
         <translation>)</translation>
     </message>
     <message>
         <source>sin</source>
         <translation>sin</translation>
     </message>
     <message>
         <source>cos</source>
         <translation>cos</translation>
     </message>
     <message>
         <source>tan</source>
         <translation>tan</translation>
     </message>
     <message>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
         <source>+/-</source>
         <translation>+/-</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>=</source>
         <translation>=</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>.</source>
         <translation>.</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <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>
         <source>Distance</source>
         <translation>Afstand</translation>
     </message>
     <message>
         <source>Area</source>
         <translation>Oppervlakte</translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation>Temperaturen</translation>
     </message>
     <message>
         <source>Volume</source>
         <translation>Volume</translation>
     </message>
     <message>
         <source>acres</source>
         <translation>are</translation>
     </message>
     <message>
         <source>&#xb0;C</source>
         <translation>°C</translation>
     </message>
     <message>
         <source>carats</source>
         <translation>karaat</translation>
     </message>
     <message>
         <source>cm</source>
         <translation>cm</translation>
     </message>
     <message>
         <source>cu cm</source>
         <translation>cu cm</translation>
     </message>
     <message>
         <source>cu ft</source>
         <translation>cu ft</translation>
     </message>
     <message>
         <source>cu in</source>
         <translation>cu in</translation>
     </message>
     <message>
         <source>&#xb0;F</source>
         <translation>°F</translation>
     </message>
     <message>
         <source>fl oz (US)</source>
         <translation>fl oz (US)</translation>
     </message>
     <message>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
         <source>g</source>
         <translation>g</translation>
     </message>
     <message>
         <source>gal (US)</source>
         <translation>gal (US)</translation>
     </message>
     <message>
         <source>hectares</source>
         <translation>hectares</translation>
     </message>
     <message>
         <source>in</source>
         <translation>in</translation>
     </message>
     <message>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
         <source>km</source>
         <translation>km</translation>
     </message>
     <message>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
         <source>lb</source>
         <translation>lb</translation>
     </message>
     <message>
         <source>Lg tons</source>
         <translation>Lg ton</translation>
     </message>
     <message>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
         <source>mg</source>
         <translation>mg</translation>
     </message>
     <message>
         <source>mi</source>
         <translation>mi</translation>
     </message>
     <message>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
         <source>mm</source>
         <translation>mm</translation>
     </message>
     <message>
         <source>naut. mi</source>
         <translation>naut. mijl</translation>
     </message>
     <message>
         <source>oz</source>
         <translation>oz</translation>
     </message>
     <message>
         <source>points</source>
         <translation>punten</translation>
     </message>
     <message>
         <source>pt</source>
         <translation>pt</translation>
     </message>
     <message>
         <source>qt</source>
         <translation>qt</translation>
     </message>
     <message>
         <source>sq cm</source>
         <translation>sq cm</translation>
     </message>
     <message>
         <source>sq ft</source>
         <translation>sq ft</translation>
     </message>
     <message>
         <source>sq in</source>
         <translation>sq in</translation>
     </message>
     <message>
         <source>sq km</source>
         <translation>sq km</translation>
     </message>
     <message>
         <source>sq m</source>
         <translation>sq m</translation>
     </message>
     <message>
         <source>sq mi</source>
         <translation>sq mi</translation>
     </message>
     <message>
         <source>sq mm</source>
         <translation>sq mm</translation>
     </message>
     <message>
         <source>sq yd</source>
         <translation>sq yd</translation>
     </message>
     <message>
         <source>st</source>
         <translation>st</translation>
     </message>
     <message>
         <source>St tons</source>
         <translation>St ton</translation>
     </message>
     <message>
         <source>tblspoon</source>
         <translation>eetlepel</translation>
     </message>
     <message>
         <source>teaspoons</source>
         <translation>theelepels</translation>
     </message>
     <message>
         <source>tonnes</source>
         <translation>ton</translation>
     </message>
     <message>
         <source>yd</source>
         <translation>yd</translation>
     </message>
 </context>
 </TS>
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
@@ -1,753 +1,645 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation>Kasboek</translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation>Nieuw Kasboek</translation>
     </message>
     <message>
         <source>Info</source>
         <translation>Informatie</translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation>Transacties</translation>
     </message>
     <message>
         <source>Charts</source>
         <translation>Grafieken</translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation>Beveilig</translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation>Klik hier om beveiliging van dit kasboek aan/uit te schakelen.</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Naam:</translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation>Geef hier naam van het kasboek in.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Type:</translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation>Geeft hier het type kasboek in.</translation>
     </message>
     <message>
-        <source>Savings</source>
-        <translation 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>
         <source>Enter account number for this checkbook here.</source>
         <translation>Voer het bankrekeningnummer van dit kasboek in.</translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation>PIN Code:</translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation>Voer hier uw PINcode van dit kasboek in.</translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation>Startsaldo:</translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation>Voer hier het startsaldo voor dit kasboek in.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notities:</translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation>Voer hier verdere info voor dit kasboek in.</translation>
     </message>
     <message>
-        <source>Current balance: %10.00</source>
-        <translation 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>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Omschrijving</translation>
     </message>
     <message>
         <source>Amount</source>
         <translation>Hoeveelheid</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nieuw</translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation>Klik hier om een nieuwe transactie in te voeren.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Wijzig</translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation>Selecteer een transactie, en klik hier om dze te wijzigen.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation>Selecteer een transactie, en klik hier om deze te verwijderen.</translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation>Selecteer hieronder de gewenste grafiek, en druk op de Teken knop.</translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation>Klik hier om het grafiektype te kiezen.</translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation>Kasboeksaldo</translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation>Opnames per kategorie</translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation>Inleggingen per kategorie</translation>
     </message>
     <message>
         <source>Draw</source>
         <translation>Teken</translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation>Klik hier om de geselecteerde grafiek te tekenen.</translation>
     </message>
     <message>
-        <source>Current balance: %1%2</source>
-        <translation type="obsolete">Huidig saldo %1%2</translation>
-    </message>
-    <message>
         <source>Enter password</source>
         <translation>Voer wachtwoord in</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Voer hier a.u.b. uw wachtwoord in:</translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation>Bevestig wachtwoord</translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation>Bevestig hier a.u.b. uw wachtwoord:</translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation>Voer hier uw wachtwoord in om verwijdering van wachtwoord te bevestigen:</translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation>Verwijder transactie</translation>
     </message>
     <message>
         <source>Sort by:</source>
         <translation>Sorteer op:</translation>
     </message>
     <message>
         <source>Select checkbook sorting here.</source>
         <translation>Selekteer sorteervolgorde voor kasboek.</translation>
     </message>
     <message>
         <source>Entry Order</source>
         <translation>Invoervolgorde</translation>
     </message>
     <message>
         <source>Number</source>
         <translation>Nummer</translation>
     </message>
     <message>
         <source>Id</source>
         <translation>Id</translation>
     </message>
     <message>
         <source>SortDate</source>
         <translation>Sorteerdatum</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>Saldo</translation>
     </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation>Konfigureer Kasboek</translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation>Geef valutasymbool in:</translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation>Geef hier uw gewenste valutasymbool in.</translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation>Laat zien of het kasboek beveiligd is</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
         <translation>Klik hier om te selecteren of het algemene scherm moet weergerven dat het kasboek wel of niet met een wachtwoord beveiligd is.</translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation>Laat kasboeksaldo&apos;s zien</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation>Klik hier om te selecteren of het algemene scherm moet weergerven wat van ieder kasboek het huidige saldo is.</translation>
     </message>
     <message>
         <source>&amp;Settings</source>
         <translation>In&amp;stellingen</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>New Account Type</source>
         <translation>Nieuw rekeningtype</translation>
     </message>
     <message>
         <source>&amp;Account Types</source>
         <translation>&amp;Rekeningtypes</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>Nieuwe kategorie</translation>
     </message>
     <message>
         <source>Expense</source>
         <translation>Uitgaven</translation>
     </message>
     <message>
         <source>Income</source>
         <translation>Inkomsten</translation>
     </message>
     <message>
         <source>&amp;Categories</source>
         <translation>&amp;Kategorieen</translation>
     </message>
     <message>
         <source>Payee</source>
         <translation>Debiteur</translation>
     </message>
     <message>
         <source>New Payee</source>
         <translation>Nieuwe Debiteur</translation>
     </message>
     <message>
         <source>&amp;Payees</source>
         <translation>&amp;Debiteuren</translation>
     </message>
     <message>
         <source>Open last checkbook</source>
         <translation>Open laatste kasboek</translation>
     </message>
     <message>
         <source>Click here to select whether the last open checkbook will be opened at startup.</source>
         <translation>Klik hier om in te stellen of het laatst geopende kasboek bij het starten geopend moet worden.</translation>
     </message>
     <message>
         <source>Show last checkbook tab</source>
         <translation>Open &quot;laatste kasboek&quot; blad</translation>
     </message>
     <message>
         <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
         <translation>Klik hier om in te stellen of het laatst geopende blad in een kasboek getoond moet worden.</translation>
     </message>
     <message>
         <source>Save new description as payee</source>
         <translation>Sla nieuwe omschtijving op als debiteur</translation>
     </message>
     <message>
         <source>Click here to save new descriptions in the list of payess.</source>
         <translation>Klik hier om de nieuwe omschrijving in de lijst van debiteuren op te slaan.</translation>
     </message>
 </context>
 <context>
     <name>ListEdit</name>
     <message>
         <source>Add</source>
         <translation>Toevoegen</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Verwijder</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation>Kasboek</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nieuw</translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation>Klik hier om een nieuw kasboek te maken.
 
 U kunt ook Nieuw kiezen uit het Kasboek menu.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Wijzig</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation>Selecteer een kasboek en klik hier om het te wijzigen.
 
 U kunt ook Wijzig uit het Kasboek menu kiezen, of de kasboeknaam ingedrukt houden.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation>Selecteer een kasboek en klik hier om het te verwijderen.
 
 U kunt ook Verwijder uit het Kasboek menu kiezen.</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Stel in</translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation>Klik hier om dit programma in te stellen.</translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation>Dit is een lijst van alle nu aanwezige kasboeken.</translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation>Kasboeknaam</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>Saldo</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Voer wachtwoord in</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Voer a.u.b. uw wachtwoord in:</translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation>Kasboek</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Wijzig</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nieuw</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <source>Savings</source>
         <translation>Spaargeld</translation>
     </message>
     <message>
         <source>Checking</source>
         <translation>Cheques</translation>
     </message>
     <message>
         <source>CD</source>
         <translation>Belastingen</translation>
     </message>
     <message>
         <source>Money market</source>
         <translation>Geldmarkt</translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation>Aandelen</translation>
     </message>
     <message>
         <source>Other</source>
         <translation>Anders</translation>
     </message>
     <message>
         <source>Expense</source>
         <translation>Uitgaven</translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation>Auto</translation>
     </message>
     <message>
         <source>Bills</source>
         <translation>Vaste lasten</translation>
     </message>
     <message>
         <source>CDs</source>
         <translation>CD&apos;s</translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation>Kleding</translation>
     </message>
     <message>
         <source>Computer</source>
         <translation>Computer</translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation>DVD&apos;s</translation>
     </message>
     <message>
         <source>Electronics</source>
         <translation>Electronica</translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation>Amusement</translation>
     </message>
     <message>
         <source>Food</source>
         <translation>Eten/Drinken</translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation>Benzine</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Overig</translation>
     </message>
     <message>
         <source>Movies</source>
         <translation>Films</translation>
     </message>
     <message>
         <source>Rent</source>
         <translation>Huur</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Reizen</translation>
     </message>
     <message>
         <source>Income</source>
         <translation>Inkomen</translation>
     </message>
     <message>
         <source>Work</source>
         <translation>Werk</translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation>Familie</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation>Diverse inkomsten</translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation>Transactie voor</translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation>Opname</translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation>Selecteer hier of de transactie een opname of een bijboeking is.</translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation>Bijboeking</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Datum:</translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation>Selecteer hier de datum van de transactie.</translation>
     </message>
     <message>
         <source>Number:</source>
         <translation>Nummer:</translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation>Voer hier het kasboeknummer in.</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Omschrijving:</translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation>Voer hier de omschrijving van de transactie in.</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorie:</translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation>Voer hier de transactiekategorie in.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Type:</translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation>Selecteer hier het transactietype.
 
 De opties die worden weergegeven zijn erop gebaseerd of dit een bijboeking of een opname is.</translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation>Bedrag:</translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation>Voer hier het bedrag van de transactie in.
 
 Dit bedrag moet altijd positief zijn.</translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation>Onkosten:</translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation>Voer hier de onkosten van deze transactie in.
 
 Dit bedrag moet altijd positief zijn.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notities:</translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation>Voer hier extra informatie over de transactie in.</translation>
     </message>
     <message>
-        <source>Automobile</source>
-        <translation 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
@@ -1,286 +1,206 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AlarmDlg</name>
     <message>
         <source>Clock</source>
         <translation type="unfinished">Klok</translation>
     </message>
     <message>
         <source>Snooze</source>
         <translation type="unfinished">Sluimer</translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AlarmDlgBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>TextLabel1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Snooze</source>
         <translation type="unfinished">Sluimer</translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thu</source>
         <comment>Thursday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fri</source>
         <comment>Friday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat</source>
         <comment>Saturday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sun</source>
         <comment>Sunday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lap/Split</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Daily Alarm:&lt;/b&gt;&lt;p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily alarm requires at least
 one day to be selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished">Alle</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished">Geluid</translation>
     </message>
 </context>
 <context>
     <name>ClockBase</name>
     <message>
         <source>Clock</source>
         <translation type="unfinished">Klok</translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stopwatch</source>
         <translation type="unfinished">Stopwatch</translation>
     </message>
     <message>
         <source>Split</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished">Start</translation>
     </message>
     <message>
         <source>Starts and stops the stopwatch.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lap/Split</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Resets the stopwatch.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check to enable the daily alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the hour the alarm will sound.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the minute the alarm will sound.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished">AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished">PM</translation>
     </message>
     <message>
         <source>Days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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
@@ -1,911 +1,831 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation>Kalender</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nieuw</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>Vandaag</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dag</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Week</translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation>Weeklijst</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Maand</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Vind</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>Wijzig...</translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation>Afspraakduur is mogelijk langer
 dan tijd tussen herhalingen.</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Kan nu data niet wijzigen door synchronisatie</translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation>Kopieer afspraak</translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation>Wijzig afspraak</translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation>minuten)</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Geen ruimte</translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation>Kalender kon uw wijzigingen
 niet opslaan.
 Maak ruimte vrij en probeer het nogmaals.
 
 Toch afsluiten?</translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation>(Onbekend)</translation>
     </message>
     <message>
         <source>Error!</source>
         <translation>Fout!</translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation>Verbeter</translation>
     </message>
     <message>
         <source>Continue</source>
         <translation>Ga door</translation>
     </message>
     <message>
         <source>error box</source>
         <translation>foutenscherm</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation>M</translation>
     </message>
     <message>
         <source>T</source>
         <translation>T</translation>
     </message>
     <message>
         <source>W</source>
         <translation>W</translation>
     </message>
     <message>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Maandag</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Dinsdag</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Woensdag</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Donderdag</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Vrijdag</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Zaterdag</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Zondag</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00 u</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Deze afspraak duurt de hele dag.</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Start</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Einde</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Tijd</translation>
     </message>
     <message>
         <source> - </source>
         <translation>-</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Wijzig</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Dupliceer</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Verstuur</translation>
     </message>
     <message>
         <source>Beam this occurence</source>
         <translation>Verzend deze gebeurtenis</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation>:00 PM</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation>:00 AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Kalender</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>Voorkeuren</translation>
     </message>
     <message>
         <source>Views</source>
         <translation>Aanzichten</translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation>Standaard aanzicht:</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dag</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Week</translation>
     </message>
     <message>
         <source>Week List</source>
         <translation>Weeklijst</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Maand</translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation>Spring naar huidig moment</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>Rij stijl:</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Standaard</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Normaal</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Groot</translation>
     </message>
     <message>
         <source>Time display</source>
         <translation>Tijdweergave</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Geen</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Start</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation>Start-Eind</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Div</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation>Alarminstelling</translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation>Alarmvoorinstelling</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>minuten</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation>Start afspraken bekijken </translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation>Aanvangstijd:</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Standaardinst.</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Locatie:</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Kantoor</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Thuis</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorie:</translation>
     </message>
+    <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>
         <translation>w</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Jan-00. Jan</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
         <translation>MDWDVZZM
 
 Weekdagen</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstEvent</name>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Wijzig</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished">Dupliceer</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Verwijder</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished">Verstuur</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>w</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>W: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
-        <source>M</source>
-        <comment>Monday</comment>
-        <translation type="obsolete">M
-
-Maandag</translation>
-    </message>
-    <message>
-        <source>T</source>
-        <comment>Tuesday</comment>
-        <translation type="obsolete">D
-
-Dinsdag</translation>
-    </message>
-    <message>
-        <source>W</source>
-        <comment>Wednesday</comment>
-        <translation type="obsolete">W
-
-Woensdag</translation>
-    </message>
-    <message>
-        <source>T</source>
-        <comment>Thursday</comment>
-        <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>
         <source>Calendar</source>
         <translation>Kalender</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>Herhaal...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>Dagelijks...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>Wekelijks...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>Maandelijks...</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>Jaarlijks...</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Geen herhaling...</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>Nieuwe afspraak</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Plaats</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Vergadering</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Lunch</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Diner</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Reis</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Omschrijving</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Kantoor</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Thuis</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>Start - Eind</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>Jan 02 00</translation>
     </message>
     <message>
         <source>Start time</source>
         <translation>Aanvangstijd</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Hele dag</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Tijdzone</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Alarm</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>minuten</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Stil</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Luid</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Herhaal</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Geen herhaling...</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Opmerking...</translation>
     </message>
-    <message>
-        <source>Start Time</source>
-        <translation type="obsolete">Aanvangstijd</translation>
-    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Wijzig opmerking</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Lunch</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Start</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Einde</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Iedere</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 iedere</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>De %1 iedere</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>De %1 %1 van iedere</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Iedere</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Maandag</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Dinsdag</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Woensdag</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Donderdag</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Vrijdag</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Zaterdag</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Zondag</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>ste</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>de</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>de</translation>
     </message>
     <message>
         <source>th</source>
         <translation>de</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation>Geen herhaling</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>dag(en)</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>we(e)k(en)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Herhaal op</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dag</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>maand(en)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>ja(a)r(en)</translation>
     </message>
     <message>
         <source>days</source>
         <translation>dagen</translation>
     </message>
     <message>
         <source>day</source>
         <translation>dag</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>weken</translation>
     </message>
     <message>
         <source>week</source>
         <translation>week</translation>
     </message>
     <message>
         <source>month</source>
         <translation>maand</translation>
     </message>
     <message>
         <source>year</source>
         <translation>jaar</translation>
     </message>
     <message>
         <source> and </source>
         <translation>en</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
 en</translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, en</translation>
     </message>
     <message>
         <source>on </source>
         <translation>om</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Herhalende afpraak</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Geen</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dag</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Week</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Maand</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Jaar</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Iedere:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Frequentie</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Eindig op:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Geen einddatum</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Herhaal op</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Ma</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Di</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Wo</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Do</translation>
     </message>
     <message>
         <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>Every</source>
         <translation>Iedere</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>WeekVar</translation>
     </message>
     <message>
         <source>months</source>
         <translation>maanden</translation>
     </message>
     <message>
         <source>years</source>
         <translation>jaren</translation>
     </message>
 </context>
 </TS>
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
@@ -1,293 +1,249 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation>Commandoselectie</translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation>Commando&apos;s</translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Commando&apos;s&lt;/B&gt;:</translation>
     </message>
     <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>
         <source>Cyan on White</source>
         <translation>Cyaan op Wit</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>Wit op Cyaan</translation>
     </message>
     <message>
         <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>
         <source>Tab</source>
         <translation>Tab</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Omhoog</translation>
     </message>
     <message>
         <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>
         <source>ScrollBar</source>
         <translation>Schuifbalk</translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation>Breek af</translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation>Gebruik piep</translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation>Laat commandolijst zien</translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation>Verberg commandolijst</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>
         <source>Hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Pink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pink on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>new session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sessions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To exit fullscreen, tap here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History Lines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konsole </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Commandoselectie</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation>Voeg commando toe</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation>Vul toe te voegen commando in:</translation>
     </message>
 </context>
 </TS>
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
@@ -1,100 +1,96 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FifteenConfigDialog</name>
     <message>
         <source>All Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select board background</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FifteenConfigDialogBase</name>
     <message>
         <source>Configure Fifteen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use a Custom Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Path:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Preview:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Grid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Rows:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
 <context>
     <name>PiecesTable</name>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Schuifpuzzel</translation>
     </message>
     <message>
         <source>Congratulations!
 You win the game!</source>
         <translation>Gefeliciteerd!
 Je hebt gewonnen!</translation>
     </message>
     <message>
         <source>R&amp;andomize Pieces</source>
         <translation>Hussel stukjes</translation>
     </message>
     <message>
         <source>&amp;Reset Pieces</source>
         <translation>Herstel stukjes</translation>
     </message>
 </context>
 </TS>
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
@@ -1,221 +1,180 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FormatterApp</name>
     <message>
         <source>Formatter</source>
         <translation>formatter</translation>
     </message>
     <message>
         <source>Storage Type</source>
         <translation>Opslagsoort</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Formatter Output</source>
         <translation>Formatteer uitvoer</translation>
     </message>
     <message>
         <source>Trying to umount.</source>
         <translation>Probeer te umounten.</translation>
     </message>
     <message>
         <source>umount failed!</source>
         <translation>umount mislukt!</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
         <source>Could not umount.
 Device is busy!</source>
         <translation>Kan niet umounten.
 Apparaat is bezig!</translation>
     </message>
     <message>
         <source>Trying to format.</source>
         <translation>Probeer te formatteren.</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>
         <source>Available: %1 kB ( %d mB)</source>
         <translation>Beschikbaar: %1 kB (%d mB)</translation>
     </message>
     <message>
         <source>CAUTION:
 Changing parameters on this
 page may cause your system
 to stop functioning properly!</source>
         <translation>WAARSCHUWING:
 Het veranderen van de instellingen
 op deze pagina kan ervoor zorgen
 dat uw systeem niet meer goed functioneert!</translation>
     </message>
     <message>
         <source>Format?</source>
         <translation>Formatteren?</translation>
     </message>
     <message>
         <source>
 with %1 filesystem?
 You will loose all data!!</source>
         <translation>met bestandssysteem %1?
 Alle data zal verloren gaan!!</translation>
     </message>
     <message>
         <source>Trying to umount %1.</source>
         <translation>Probeer %1 te umount-en.</translation>
     </message>
     <message>
         <source>Trying to mount %1.</source>
         <translation>Probeer %1 te mounten.</translation>
     </message>
     <message>
         <source>%1
 has been successfully mounted.</source>
         <translation>%1
 is succesvol gemount.</translation>
     </message>
     <message>
         <source>Storage Type: %1</source>
         <translation>Opslagtype: %1</translation>
     </message>
     <message>
         <source>Type: %1
 Formatted with %2
 %3, %4, %5</source>
         <translation>Type %1
 Geformatteerd met %2
 %3, %4, %5</translation>
     </message>
 </context>
 </TS>
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
@@ -1,56 +1,52 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GoMainWidget</name>
     <message>
         <source>New Game</source>
         <translation>Nieuw spel</translation>
     </message>
     <message>
         <source>Pass</source>
         <translation>Pas</translation>
     </message>
     <message>
         <source>Resign</source>
         <translation>Geef op</translation>
     </message>
     <message>
         <source>Two player option</source>
         <translation>Twee speler optie</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Spel</translation>
     </message>
 </context>
 <context>
     <name>GoWidget</name>
     <message>
         <source>White %1, Black %2. </source>
         <translation>Wit %1, Zwart %2</translation>
     </message>
     <message>
         <source>White wins.</source>
         <translation>Wit wint.</translation>
     </message>
     <message>
         <source>Black wins.</source>
         <translation>Zwart wint.</translation>
     </message>
     <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
@@ -1,41 +1,37 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HelpBrowser</name>
     <message>
         <source>Backward</source>
         <translation>Terug</translation>
     </message>
     <message>
         <source>Forward</source>
         <translation>Vooruit</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Thuis</translation>
     </message>
     <message>
         <source>Add Bookmark</source>
         <translation>Maak bookmark</translation>
     </message>
     <message>
         <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
@@ -1,68 +1,64 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KBill</name>
     <message>
         <source>kBill</source>
         <translation>kBill</translation>
     </message>
     <message>
         <source>New game</source>
         <translation>Nieuw spel</translation>
     </message>
     <message>
         <source>Pause game</source>
         <translation>Pauzeer spel</translation>
     </message>
     <message>
         <source>Story of kBill</source>
         <translation>kBill uitleg</translation>
     </message>
     <message>
         <source>Rules</source>
         <translation>Regels</translation>
     </message>
     <message>
         <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>
         <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 disguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</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>
 </context>
 <context>
     <name>UI</name>
     <message>
         <source>After Level</source>
         <translation>Na ronde</translation>
     </message>
     <message>
         <source>Your score</source>
         <translation>Uw score</translation>
     </message>
 </context>
 </TS>
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
@@ -1,296 +1,292 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KRFBConnection</name>
     <message>
         <source>Connected</source>
         <translation>Verbonden</translation>
     </message>
     <message>
         <source>Connection Refused</source>
         <translation>Verbinding geweigerd</translation>
     </message>
     <message>
         <source>Host not found</source>
         <translation>Doelcomputer niet gevonden</translation>
     </message>
     <message>
         <source>Read Error: QSocket reported an error reading
 data, the remote host has probably dropped the
 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>
         <source>Protocol Error: An unknown encoding was used by the server %1</source>
         <translation>Protocolfout: De server %1 gebruikt een onbekende codering</translation>
     </message>
     <message>
         <source>Waiting for server initialization...</source>
         <translation>Wacht op serverinitialisatie...</translation>
     </message>
 </context>
 <context>
     <name>KRFBLogin</name>
     <message>
         <source>Waiting for server version...</source>
         <translation>Wacht op serverversie....</translation>
     </message>
     <message>
         <source>Error: Invalid server version, %1</source>
         <translation>Fout: Verkeerde serverversie, %1</translation>
     </message>
     <message>
         <source>Error: Unsupported server version, %1</source>
         <translation>Fout: niet ondersteunde serverversie, %1</translation>
     </message>
     <message>
         <source>Logged in</source>
         <translation>Aangemeld</translation>
     </message>
     <message>
         <source>Error: This server requires a password, but none has been specified.
 </source>
         <translation>Fout: Deze server verwacht een wachtwoord, maar er is er geen ingevoerd.
 </translation>
     </message>
     <message>
         <source>Error: The password you specified was incorrect.</source>
         <translation>Fout: Het ingevoerde wachtwoord was niet juist.</translation>
     </message>
     <message>
         <source>Error: Too many invalid login attempts have been made
 to this account, please try later.</source>
         <translation>Fout: Er zijn teveel foute inlogpogingen gedaan op deze
 account, probeer het later nog eens.</translation>
     </message>
     <message>
         <source>Login Failed</source>
         <translation>Inloggen mislukt</translation>
     </message>
     <message>
         <source>Too many failures</source>
         <translation>Te vaak mislukt</translation>
     </message>
 </context>
 <context>
     <name>KVNC</name>
     <message>
         <source>VNC Viewer</source>
         <translation>VNC Viewer</translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation>Nieuwe verbinding</translation>
     </message>
     <message>
         <source>Open Bookmark</source>
         <translation>Open favorieten</translation>
     </message>
     <message>
         <source>Delete Bookmark</source>
         <translation>Verwijder favoriet</translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation>Volledig scherm</translation>
     </message>
     <message>
         <source>Send Contrl-Alt-Delete</source>
         <translation>Zend Ctrl-Alt-Del</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>Verbreek verbinding</translation>
     </message>
     <message>
         <source>Next Click is Double Click</source>
         <translation>Volgende klik is een dubbelklik</translation>
     </message>
     <message>
         <source>Next Click is Right Click</source>
         <translation>Volgende klik is een Rechtsklik</translation>
     </message>
     <message>
         <source>Stop Full Screen</source>
         <translation>Einde Volledig Scherm</translation>
     </message>
     <message>
         <source>Connected to remote host</source>
         <translation>Verbonden met computer op afstand</translation>
     </message>
     <message>
         <source>Logged in to remote host</source>
         <translation>Ingelogd op computer op afstand</translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation>Verbinding verbroken</translation>
     </message>
 </context>
 <context>
     <name>KVNCBookmarkDlgBase</name>
     <message>
         <source>Bookmarks</source>
         <translation>Favorieten</translation>
     </message>
     <message>
         <source>Choose a bookmark that you would like to open</source>
         <translation>Kies een favoriet die je wilt openen</translation>
     </message>
 </context>
 <context>
     <name>KVNCConnDlgBase</name>
     <message>
         <source>VNC Viewer Connection</source>
         <translation>VNC Viewer verbinding</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
         <source>The password of the VNC server</source>
         <translation>Het wachtwoord van de VNC Server</translation>
     </message>
     <message>
         <source>Show Password</source>
         <translation>Geef wachtwoord weer</translation>
     </message>
     <message>
         <source>Toggle obscuring the password</source>
         <translation>Verberg wachtwoord aan/uit</translation>
     </message>
     <message>
         <source>Password:</source>
         <translation>Wachtwoord:</translation>
     </message>
     <message>
         <source>The name of the VNC server</source>
         <translation>De naam ven de VNC Server</translation>
     </message>
     <message>
         <source>Bookmark Name:</source>
         <translation>Favoriet naam:</translation>
     </message>
     <message>
         <source>The host name of the VNC server</source>
         <translation>De hostnaam van de VNC Server</translation>
     </message>
     <message>
         <source>Host Name:</source>
         <translation>Hostnaam:</translation>
     </message>
     <message>
         <source>Display Number:</source>
         <translation>Schermnummer:</translation>
     </message>
     <message>
         <source>The display number of the VNC server</source>
         <translation>Het schermnummer van de VNC Server</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opties</translation>
     </message>
     <message>
         <source>Request shared session</source>
         <translation>Vraag gedeelde sessie aan</translation>
     </message>
     <message>
         <source>Allow other users to connect to the VNC server</source>
         <translation>Sta andere gebruikers toe verbinding te maken met de VNC Server</translation>
     </message>
     <message>
         <source>Request 8-bit session</source>
         <translation>Vraag 8-bit sessie aan</translation>
     </message>
     <message>
         <source>Request that the VNC server transfer 8 bit color</source>
         <translation>Vraag aan de VNC Server om een verbinding met 8-bits kleur</translation>
     </message>
     <message>
         <source>Delay between requesting updates from the server</source>
         <translation>Vertraging tussen bijwerkingen van de server</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>Scale the remote display to fit on the PDA (Slow)</source>
         <translation>Verschaal het beeldscherm zodat het op het PDA scherm past (langzaam)</translation>
     </message>
     <message>
         <source>Scale Factor</source>
         <translation>Schaalfactor</translation>
     </message>
     <message>
         <source>Milliseconds</source>
         <translation>Milliseconden</translation>
     </message>
     <message>
         <source>Raise on bell</source>
         <translation>Naar voren bij Bericht</translation>
     </message>
     <message>
         <source>Check for screen updates every:</source>
         <translation>Controleer op schermupdates iedere:</translation>
     </message>
     <message>
         <source>Encodings</source>
         <translation>Coderingen</translation>
     </message>
     <message>
         <source>Hextile encoding</source>
         <translation>Hextile codering</translation>
     </message>
     <message>
         <source>CoRRE encoding</source>
         <translation>CoRRE codering</translation>
     </message>
     <message>
         <source>RRE encoding</source>
         <translation>RRE codering</translation>
     </message>
     <message>
         <source>Copy rectangle encoding</source>
         <translation>Copy rectangle codering</translation>
     </message>
     <message>
         <source>Enable transmiting identical rectangles as references to existing data</source>
         <translation>Zet verzending van identieke rechthoeken aan als referenties naar bestaande data</translation>
     </message>
 </context>
 </TS>
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
@@ -1,258 +1,248 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Keys</name>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Standaardinstellingen</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Annuleer</translation>
     </message>
     <message>
         <source>Change Direction Keys</source>
         <translation>Verander richtingtoetsen</translation>
     </message>
     <message>
         <source>Undefined key</source>
         <translation>Ongedefinieerde toets</translation>
     </message>
 </context>
 <context>
     <name>Kpacman</name>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Nieuw</translation>
     </message>
     <message>
         <source>&amp;Pause</source>
         <translation>&amp;Pause</translation>
     </message>
     <message>
         <source>&amp;Hall of fame</source>
         <translation>&amp;Highscore</translation>
     </message>
     <message>
         <source>&amp;Quit</source>
         <translation>&amp;Stop</translation>
     </message>
     <message>
         <source>&amp;Hide Mousecursor</source>
         <translation>&amp;Verberg Muiscursor</translation>
     </message>
     <message>
         <source>&amp;Select graphic scheme</source>
         <translation>&amp;Selecteer grafiche elementen</translation>
     </message>
     <message>
         <source>&amp;Pause in Background</source>
         <translation>&amp;Pauzeer in de achtergrond</translation>
     </message>
     <message>
         <source>&amp;Continue in Foreground</source>
         <translation>&amp;Ga door op de voorgrond</translation>
     </message>
     <message>
         <source>Change &amp;keys...</source>
         <translation>Verander &amp;toetsen...</translation>
     </message>
     <message>
         <source>@PACKAGE@ - @VERSION@
 
 Joerg Thoennissen (joe@dsite.de)
 
 A pacman game for the KDE Desktop
 
 The program based on the source of ksnake
 by Michel Filippi (mfilippi@sade.rhein-main.de).
 The design was strongly influenced by the pacman
 (c) 1980 MIDWAY MFG.CO.
 
 I like to thank my girlfriend Elke Krueers for
 the last 10 years of her friendship.
 </source>
         <translation>@PACKAGE@ - @VERSION@
 
 Joerg Thoenissen (joe@dsite.de)
 
 Een pacman spel voor de KDE Desktop
 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
 
 Het bestand &apos;@FONTNAME@&apos; bestaat niet,
 of is in een onbekend formaat.</translation>
     </message>
 </context>
 <context>
     <name>Referee</name>
     <message>
         <source>GAME  OVER</source>
         <translation>GAME OVER</translation>
     </message>
     <message>
         <source>PLAYER ONE</source>
         <translation>SPELER EEN</translation>
     </message>
     <message>
         <source>READY!</source>
         <translation>KLAAR!</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>PAUZE</translation>
     </message>
     <message>
         <source>CHARACTER</source>
         <translation>KARAKTER</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>NICKNAME</source>
         <translation>BIJNAAM</translation>
     </message>
     <message>
         <source>-SHADOW</source>
         <translation>-SCHADUW</translation>
     </message>
     <message>
         <source>&quot;BLINKY&quot;</source>
         <translation>&quot;BLINKY&quot;</translation>
     </message>
     <message>
         <source>-SPEEDY</source>
         <translation>-SPEEDY</translation>
     </message>
     <message>
         <source>&quot;PINKY&quot;</source>
         <translation>&quot;PINKY&quot;</translation>
     </message>
     <message>
         <source>-BASHFUL</source>
         <translation>-MEPPER</translation>
     </message>
     <message>
         <source>&quot;INKY&quot;</source>
         <translation>&quot;INKY&quot;</translation>
     </message>
     <message>
         <source>-POKEY</source>
         <translation>-PRIKKER</translation>
     </message>
     <message>
         <source>&quot;CLYDE&quot;</source>
         <translation>&quot;CLYDE&quot;</translation>
     </message>
     <message>
         <source>QTOPIA PORT: CATALIN CLIMOV</source>
         <translation>QTOPIA AANPASSING: CATALIN CLIMOV</translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
         <translation>DRUK OP CURSOR OM TE STARTEN</translation>
     </message>
 </context>
 <context>
     <name>Score</name>
     <message>
         <source>  1UP </source>
         <translation>1UP</translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
         <translation>HIGH SCORE</translation>
     </message>
     <message>
         <source>  2UP </source>
         <translation>2UP</translation>
     </message>
     <message>
         <source>     CONGRATULATIONS      </source>
         <translation>    GEFELICITEERD</translation>
     </message>
     <message>
         <source>    YOU HAVE ARCHIEVED    </source>
         <translation>   U EEN TOP 10 SCORE</translation>
     </message>
     <message>
         <source>  A SCORE IN THE TOP 10.  </source>
         <translation>BEHAALD.</translation>
     </message>
     <message>
         <source>RNK   SCORE  NAME   DATE</source>
         <translation>RNK   SCORE  NAAM  DATUM</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>PAUSED</translation>
     </message>
     <message>
         <source>@YY@/@MM@/@DD@</source>
         <translation>@YY@/@MM@/@DD@</translation>
     </message>
     <message>
         <source></source>
         <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>De pixelmap kan niet worden gemaakt.
 
 Het bestand &apos;@PIXMAPNAME@&apos; bestaat niet,
 of is in een onbekend formaat.</translation>
     </message>
     <message>
         <source>Initialization Error</source>
         <translation>Initialisatiefout</translation>
     </message>
 </context>
 </TS>
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
@@ -1,305 +1,278 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DocTabSettings</name>
     <message>
         <source>Enable the Documents Tab</source>
         <translation>Zet Documenttabblad aan</translation>
     </message>
     <message>
         <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
         <translation>&lt;b&gt;Let op:&lt;/b&gt; Om deze verandering door te voeren kan het noodzakelijk zijn Opie opnieuw op te starten.</translation>
     </message>
     <message>
         <source>Check, if you want the Documents Tab to be visible.</source>
         <translation>Vink dit aan als het Documenttablad zichtbaar moet zijn.</translation>
     </message>
 </context>
 <context>
     <name>InputMethodSettings</name>
     <message>
         <source>Resize application on Popup</source>
         <translation>Pas schermgrootte aan bij popup</translation>
     </message>
     <message>
         <source>Enable floating and resizing</source>
         <translation>Zet verplaatsen en verschalen aan</translation>
     </message>
     <message>
         <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
         <translation>&lt;b&gt;Let op:&lt;/b&gt; Om deze verandering door te voeren kan het noodzakelijk zijn Opie opnieuw op te starten.</translation>
     </message>
     <message>
         <source>Check, if you want the application to be automatically resized if the input method pops up.</source>
         <translation>Activeer dit als je vensters automatisch wilt laten verschalen als een invulveld opkomt.</translation>
     </message>
     <message>
         <source>Check, if you want to move and/or resize input methods</source>
         <translation>Activeer dit als je invulvelden wilt kunnen verschalen en verplaatsen</translation>
     </message>
     <message>
         <source>Specify the percentage of the screen width for the input method</source>
         <translation>Stel het percentage in dat invulvelden maximaal in de breedte mogen zijn</translation>
     </message>
 </context>
 <context>
     <name>LauncherSettings</name>
     <message>
         <source>Launcher Settings</source>
         <translation>Launcher instellingen</translation>
     </message>
     <message>
         <source>Taskbar</source>
         <translation>Taakbalk</translation>
     </message>
     <message>
         <source>O-Menu</source>
         <translation>O-Menu</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Tabbladen</translation>
     </message>
     <message>
         <source>InputMethods</source>
         <translation>Invoermethoden</translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation>DocTab</translation>
     </message>
 </context>
 <context>
     <name>MenuSettings</name>
     <message>
         <source>Load applets in O-Menu:</source>
         <translation>Laad applets in O-Menu:</translation>
     </message>
     <message>
         <source>Show Launcher tabs in O-Menu</source>
         <translation>Laat Launcher tabbladen zien in O_Menu</translation>
     </message>
     <message>
         <source>Check the applets that you want to have included in the O-Menu.</source>
         <translation>Vink de applets aan die je wilt gebruiken in het O-menu.</translation>
     </message>
     <message>
         <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
         <translation>Voegt de inhoud van de Launcher tabbladen toe aan het O-Menu.</translation>
     </message>
     <message>
-        <source>Show Applications in subpopups</source>
-        <translation type="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>
     </message>
     <message>
         <source>Icons</source>
         <translation>Iconen</translation>
     </message>
     <message>
         <source>Previewing %1</source>
         <translation>Voorbeeld %1</translation>
     </message>
     <message>
         <source>This is a rough preview of what the currently selected Tab will look like.</source>
         <translation>Dit is een ruw voorbeeld van hoe het geselecteerde tabblad eruit zal zien.</translation>
     </message>
     <message>
         <source>Use a custom font</source>
         <translation>Gebruik een eigen lettertype</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Type:</translation>
     </message>
     <message>
         <source>Ruled</source>
         <translation>Geregeld</translation>
     </message>
     <message>
         <source>Solid color</source>
         <translation>Vulkleur</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Plaatje</translation>
     </message>
     <message>
         <source>Select...</source>
         <translation>Selecteer...</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Satandaard</translation>
     </message>
     <message>
         <source>Size:</source>
         <translation>Grootte:</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Klein</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Groot</translation>
     </message>
     <message>
         <source>Color:</source>
         <translation>Kleur:</translation>
     </message>
     <message>
         <source>Columns:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatic</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TabsSettings</name>
     <message>
         <source>Launcher Tabs:</source>
         <translation>Launcher tabbladen:</translation>
     </message>
     <message>
         <source>foobar</source>
         <translation>foo-balk</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nieuw</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Wijzig</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <source>Enable big busy indicator</source>
         <translation>Gebruik groot &apos;bezig&apos; icoon</translation>
     </message>
     <message>
-        <source>Enable blinking busy indicator</source>
-        <translation 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>
         <source>Not implemented yet</source>
         <translation>Nog niet geimplementeerd</translation>
     </message>
     <message>
         <source>Enable animated busy indicator</source>
         <translation>Gebruik bewegend &apos;bezig&apos; icoon</translation>
     </message>
     <message>
         <source>Activate this, if you want an animatedbusy indicator for starting applications in the Launcher.</source>
         <translation>Activeer dit als je een bewegend &apos;bezig&apos; icoon in het midden van het scherm wilt ipv een in de taakbalk.</translation>
     </message>
     <message>
         <source>Enable static background pixmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Activate this, if you want the background pixmap not to scroll with the icons.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskbarSettings</name>
     <message>
         <source>Load applets in Taskbar:</source>
         <translation>Laad applets in de Taakbalk:</translation>
     </message>
     <message>
         <source>Check the applets that you want displayed in the Taskbar.</source>
         <translation>Vink de applets aan die je in de taakbalk wilt hebben.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/libaboutapplet.ts b/i18n/nl/libaboutapplet.ts
index 1d77b4b..68f81a4 100644
--- a/i18n/nl/libaboutapplet.ts
+++ b/i18n/nl/libaboutapplet.ts
@@ -1,168 +1,75 @@
 <!DOCTYPE TS><TS>
 <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>
         <source>Authors</source>
         <translation type="unfinished">Schrijvers</translation>
     </message>
     <message>
         <source>Report</source>
         <translation type="unfinished">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;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"></translation>
     </message>
     <message>
         <source>Join</source>
         <translation type="unfinished">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;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="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.2&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished">&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.2&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;Alberto &apos;Skyhusker&apos; Garcia Hierro&lt;/b&gt; (skyhusker@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="unfinished"></translation>
     </message>
 </context>
 </TS>
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,114 +1,86 @@
 <!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>
         <source>Very Low</source>
         <translation>Erg laag</translation>
     </message>
     <message>
         <source>Critical</source>
         <translation>Kritiek</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Onbekend</translation>
     </message>
     <message>
         <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>
         <source>Remaing Power: %1 %2
 Remaining Time: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ipaq  %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,27 +1,17 @@
 <!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>
 </TS>
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,1521 +1,1437 @@
 <!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>
     </message>
     <message>
         <source>New Account</source>
         <translation>Nieuwe verbinding</translation>
     </message>
     <message>
         <source>Edit Account: </source>
         <translation>Wijzig verbinding:</translation>
     </message>
     <message>
         <source>Dial</source>
         <translation>Kies</translation>
     </message>
     <message>
         <source>Edit Login Script</source>
         <translation>Wijzig inloggegevens</translation>
     </message>
     <message>
         <source>Authentication</source>
         <translation>Identificatie</translation>
     </message>
     <message>
         <source>IP Setup</source>
         <translation>IP instelling</translation>
     </message>
     <message>
         <source>IP</source>
         <translation>IP</translation>
     </message>
     <message>
         <source>Gateway Setup</source>
         <translation>Gateway instelling</translation>
     </message>
     <message>
         <source>Gateway</source>
         <translation>Gateway</translation>
     </message>
     <message>
         <source>DNS Servers</source>
         <translation>DNS Servers</translation>
     </message>
     <message>
         <source>DNS</source>
         <translation>DNS</translation>
     </message>
     <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>
         <source>PAP</source>
         <translation>PAP</translation>
     </message>
     <message>
         <source>Terminal-based</source>
         <translation>Terminal-gebaseerd</translation>
     </message>
     <message>
         <source>CHAP</source>
         <translation>CHAP</translation>
     </message>
     <message>
         <source>PAP/CHAP</source>
         <translation>PAP/CHAP</translation>
     </message>
     <message>
         <source>&lt;p&gt;Specifies the method used to identify yourself to
 the PPP server. Most universities still use
 &lt;b&gt;Terminal&lt;/b&gt;- or &lt;b&gt;Script&lt;/b&gt;-based authentication,
 while most ISP use &lt;b&gt;PAP&lt;/b&gt; and/or &lt;b&gt;CHAP&lt;/b&gt;. If
 unsure, contact your ISP.
 
 If you can choose between PAP and CHAP,
 choose CHAP, because it&apos;s much safer. If you don&apos;t know
 whether PAP or CHAP is right, choose PAP/CHAP.</source>
         <translation>&lt;p&gt;Geeft de identificatiemethode van de PPP server weer.
 De meeste universiteiten gebruiken nog &lt;b&gt;Terminal&lt;/b&gt;- or 
 &lt;b&gt;Script&lt;/b&gt;-gebaseerde identificatie, terwijl de meeste 
 providers&lt;b&gt;PAP&lt;/b&gt; en/of &lt;b&gt;CHAP&lt;/b&gt; gebruiken.
 Vraag bij onzekerheid je provider.
 
 Als je kunt kiezen tussen PAP and CHAP, kies dan CHAP,
 want het is veel veiliger. Weet je niet welke, kies dan PAP/CHAP.</translation>
     </message>
     <message>
         <source>Username: </source>
         <translation>Gebruikersnaam:</translation>
     </message>
     <message>
         <source>Enter your username here...</source>
         <translation>Voer hier je gebruikersnaam in...</translation>
     </message>
     <message>
         <source>Password: </source>
         <translation>Wachtwoord:</translation>
     </message>
     <message>
         <source>Enter your password here</source>
         <translation>Voer hier je wachtwoord in</translation>
     </message>
     <message>
         <source>Store password</source>
         <translation>Bewaar wachtwoord</translation>
     </message>
     <message>
         <source>&lt;p&gt;When this is turned on, your ISP password
 will be saved in &lt;i&gt;kppp&lt;/i&gt;&apos;s config file, so
 you do not need to type it in every time.
 
 &lt;b&gt;&lt;font color=&quot;red&quot;&gt;Warning:&lt;/font&gt; your password will be stored as
 plain text in the config file, which is
 readable only to you. Make sure nobody
 gains access to this file!</source>
         <translation>&lt;p&gt;Als dit ingeschakeld is, wordt het wachtwoord
 in het &lt;i&gt;kppp&lt;/i&gt;&apos;s config bestand opgeslagen, 
 zodat je het niet iedere keer hoeft in te typen.
 
 &lt;b&gt;&lt;font color=&quot;red&quot;&gt;Waarschuwing:&lt;/font&gt; het wachtwoord wordt
 niet versleuteld bewaard in het config bestand,
 dat alleen voor jou leesbaar is. Zorg ervoor dat
 niemand er toegang toe krijgt!</translation>
     </message>
     <message>
         <source>error</source>
         <translation>fout</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Login script has unbalanced loop Start/End&lt;qt&gt;</source>
         <translation>&lt;qt&gt;Inlogscript heeft fout in start/stop script&lt;qt&gt;</translation>
     </message>
 </context>
 <context>
     <name>ChooserWidget</name>
     <message>
         <source>&amp;Edit...</source>
         <translation>&amp;Wijzig...</translation>
     </message>
     <message>
         <source>&amp;New...</source>
         <translation>&amp;Nieuw...</translation>
     </message>
     <message>
         <source>Co&amp;py</source>
         <translation>Ko&amp;pieer</translation>
     </message>
     <message>
         <source>De&amp;lete</source>
         <translation>&amp;Verwijder</translation>
     </message>
 </context>
 <context>
     <name>DNSWidget</name>
     <message>
         <source>Domain name:</source>
         <translation>Domeinnaam:</translation>
     </message>
     <message>
         <source>If you enter a domain name here, this domain
 name is used for your computer while you are
 connected. When the connection is closed, the
 original domain name of your computer is
 restored.
 
 If you leave this field blank, no changes are
 made to the domain name.</source>
         <translation>Als je hier een domeinnaam invult, wordt deze
 gebruikt gedurende de verbinding. Als de 
 verbinding verbroken wordt, wordt de 
 oorspronkelijke domeinnaam van de computer
 hersteld.
 
 Als dit veld leeg blijft, wordt de domeinnaam niet veranderd.</translation>
     </message>
     <message>
         <source>Configuration:</source>
         <translation>Configuratie:</translation>
     </message>
     <message>
         <source>Automatic</source>
         <translation>Automatisch</translation>
     </message>
     <message>
         <source>Manual</source>
         <translation>Handmatig</translation>
     </message>
     <message>
         <source>DNS IP address:</source>
         <translation>DNS IP adres:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Allows you to specify a new DNS server to be
 used while you are connected. When the
 connection is closed, this DNS entry will be
 removed again.
 
 To add a DNS server, type in the IP address of
 the DNS server here and click on &lt;b&gt;Add&lt;/b&gt;</source>
         <translation>&lt;p&gt;Hiermee kan een DNS server worden ingesteld
 voor gebruik tijdens de verbinding. Als de verbinding 
 verbroken wordt, wordt deze DNS server weer verwijderd.
 
 Voer het IP adres van de DNS server in, en druk op 
 &lt;b&gt;Toevoegen&lt;/b&gt;, om een DNS server in te stellen</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Toevoegen</translation>
     </message>
     <message>
         <source>Click this button to add the DNS server
 specified in the field above. The entry
 will then be added to the list below</source>
         <translation>Klik hier om de DNS server hierboven
 toe te voegen. Deze zal dan in de lijst 
 hieronder worden weergegeven</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Verwijderen</translation>
     </message>
     <message>
         <source>Click this button to remove the selected DNS
 server entry from the list below</source>
         <translation>Klik hier om de geselecteerde DNS server uit de
 onderstaande lijst te verwijderen</translation>
     </message>
     <message>
         <source>DNS address list:</source>
         <translation>DNS adreslijst:</translation>
     </message>
     <message>
         <source>&lt;p&gt;This shows all defined DNS servers to use
 while you are connected. Use the &lt;b&gt;Add&lt;/b&gt; and
 &lt;b&gt;Remove&lt;/b&gt; buttons to modify the list</source>
         <translation>&lt;p&gt;Hier worden alle tijdens verbinding te 
 gebruiken DNS servers weergegeven. Gebruik de
 &lt;b&gt;Toevoegen&lt;/b&gt; en &lt;b&gt;Verwijderen&lt;/b&gt; knoppen
 om de lijst te veranderen</translation>
     </message>
     <message>
         <source>Disable DNS servers during connection</source>
         <translation>Schakel DNS servers uit tijdens verbinden</translation>
     </message>
     <message>
         <source>&lt;p&gt;When this option is selected, all DNS
 servers specified in &lt;tt&gt;/etc/resolv.conf&lt;/tt&gt; are
 temporary disabled while the dialup connection
 is established. After the connection is
 closed, the servers will be re-enabled
 
 Typically, there is no reason to use this
 option, but it may become useful under 
 some circumstances.</source>
         <translation>Als deze optie ingeschakeld is, worden alle
 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>
     </message>
     <message>
         <source>New Device</source>
         <translation>Nieuw apparaat</translation>
     </message>
     <message>
         <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>
         <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>&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;Verwijdert het geselecteerde
 apparaat
 &lt;font color=&quot;red&quot;&gt;&lt;b&gt;Pas op!&lt;/b&gt;&lt;/font&gt;</translation>
     </message>
     <message>
         <source>You must enter a unique device name</source>
         <translation>Unieke verbindingsnaam invoeren</translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished">Fout</translation>
     </message>
 </context>
 <context>
     <name>DialWidget</name>
     <message>
         <source>Connection name:</source>
         <translation>Verbindingsnaam:</translation>
     </message>
     <message>
         <source>Type in a unique name for this connection</source>
         <translation>Voer een unieke naam voor deze verbinding in</translation>
     </message>
     <message>
         <source>Phone number:</source>
         <translation>Telefoonnummer:</translation>
     </message>
     <message>
         <source>&amp;Add...</source>
         <translation>&amp;Toevoegen...</translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation>Ve&amp;rwijder</translation>
     </message>
     <message>
         <source>&lt;p&gt;Specifies the phone numbers to dial. You
 can supply multiple numbers here, simply
 click on &quot;Add&quot;. You can arrange the
 order the numbers are tried by using the
 arrow buttons.
 
 When a number is busy or fails, &lt;i&gt;kppp&lt;/i&gt; will 
 try the next number and so on</source>
         <translation>&lt;p&gt;Stelt de te kiezen telefoonnummers in. Er
 kunnen meerdere nummers ingevuld worden
 door &lt;b&gt;Toevoegen&lt;/b&gt; te kiezen. De volgorde kan
 worden bepaald door gebruik van de pijltjestoetsen.
 
 Als met een nummer niet verbonden kan worden, zal
 &lt;i&gt;kppp&lt;/i&gt; het volgende proberen enz.</translation>
     </message>
     <message>
         <source>Customize pppd Arguments...</source>
         <translation>Wijzig pppd instellingen...</translation>
     </message>
 </context>
 <context>
     <name>ExecWidget</name>
     <message>
         <source>Here you can select commands to run at certain stages of the connection. The commands are run with your real user id, so you cannot run any commands here requiring root permissions (unless, of course, you are root).&lt;br&gt;&lt;br&gt;Be sure to supply the whole path to the program otherwise we might be unable to find it.</source>
         <translation>Hier kunnen opdrachten worden ingesteld om uitgevoerd te worden tijdens verschillende onderdelen van het verbinden. De opdrachten worden uitgevoerd met deze user-id, dus kunnen er geen opdrachten worden gebruikt die root rechten gebruiken (tenzij dit root is natuurlijk). &lt;br&gt;&lt;br&gt;Zorg ervoor dat het volledige pad ingevuld wordt, anders is het misschien onvindbaar.</translation>
     </message>
     <message>
         <source>Before connect:</source>
         <translation>Voor verbinding:</translation>
     </message>
     <message>
         <source>Allows you to run a program &lt;b&gt;before&lt;/b&gt; a connection
 is established. It is called immediately before
 dialing has begun.
 
 This might be useful, e.g. to stop HylaFAX blocking the
 modem.</source>
         <translation>Hiermee kan een programma worden gestart &lt;b&gt;voordat&lt;/b&gt; 
 een verbinding wordt gemaakt. Het wordt direct voor het 
 inbellen gestart.
 
 Dit kan handig zijn, bv. om HylaFAX tijdelijk uit te schakelen,
 omdat deze de lijn blokkeert.</translation>
     </message>
     <message>
         <source>Upon connect:</source>
         <translation>Na verbinden:</translation>
     </message>
     <message>
         <source>Allows you to run a program &lt;b&gt;after&lt;/b&gt; a connection
 is established. When your program is called, all
 preparations for an Internet connection are finished.
 
 Very useful for fetching mail and news</source>
         <translation>Hiermee kan een programma worden gestart &lt;b&gt;nadat&lt;/b&gt; 
 een verbinding is gemaakt. Het programma wordt pas
 gestart nadat de internetverbinding is opgebouwd.
 
 Erg handig voor het ophalen van mail en nieuws</translation>
     </message>
     <message>
         <source>Before disconnect:</source>
         <translation>Voor verbreken:</translation>
     </message>
     <message>
         <source>Allows you to run a program &lt;b&gt;before&lt;/b&gt; a connection
 is closed. The connection will stay open until
 the program exits.</source>
         <translation>Hiermee kan een programma worden gestart &lt;b&gt;voordat&lt;/b&gt; 
 de verbinding wordt gesloten. De verbinding blijft open
 tot het programma gestopt is.</translation>
     </message>
     <message>
         <source>Upon disconnect:</source>
         <translation>Na verbreken:</translation>
     </message>
     <message>
         <source>Allows you to run a program &lt;b&gt;after&lt;/b&gt; a connection
 has been closed.</source>
         <translation>Hiermee kan een prograama worden gestart &lt;b&gt;nadat&lt;/b&gt;
 de verbinding is gesloten.</translation>
     </message>
 </context>
 <context>
     <name>GatewayWidget</name>
     <message>
         <source>Configuration</source>
         <translation>Configuratie</translation>
     </message>
     <message>
         <source>Default gateway</source>
         <translation>Standaardgateway</translation>
     </message>
     <message>
         <source>This makes the PPP peer computer (the computer
 you are connected to with your modem) to act as
 a gateway. Your computer will send all packets not
 going to a computer inside your local net to this
 computer, which will route these packets.
 
 This is the default for most ISPs, so you should
 probably leave this option on.</source>
         <translation>Deze optie zorgt ervoor dat de PPP peer computer
 (de computer waar verbinding mee gemaakt wordt)
 als gateway fungeert. Deze computer zal dan alle
 gegevens die niet voor het lokale netwerk zijn,
 doorsturen naar die computer, die dan de
 routering zal verzorgen.
 
 Dit is een standaardinstelling, meestal is deze juist.</translation>
     </message>
     <message>
         <source>Static gateway</source>
         <translation>Statische gateway</translation>
     </message>
     <message>
         <source>&lt;p&gt;Allows you to specify which computer you want
 to use as gateway (see &lt;i&gt;Default Gateway&lt;/i&gt; above)</source>
         <translation>&lt;p&gt;Geeft aan welke computer als gateway gebruikt
 moet worden (zie &lt;i&gt;Standaardgateway&lt;/i&gt; hierboven)</translation>
     </message>
     <message>
         <source>Gateway IP address:</source>
         <translation>Gateway IP adres:</translation>
     </message>
     <message>
         <source>Assign the default route to this gateway</source>
         <translation>Stel de standaard gateway route in</translation>
     </message>
     <message>
         <source>If this option is enabled, all packets not
 going to the local net are routed through
 the PPP connection.
 
 Normally, you should turn this on</source>
         <translation>Als deze functie aan staat worden alle
 gegevens buiten het lokale netwerk
 doorgeleid via de PPP verbinding.
 
 Normaal staat dit aan</translation>
     </message>
 </context>
 <context>
     <name>IPWidget</name>
     <message>
         <source>Configuration</source>
         <translation>Configuratie</translation>
     </message>
     <message>
         <source>Dynamic IP address</source>
         <translation>Dynamisch IP adres</translation>
     </message>
     <message>
         <source>Select this option when your computer gets an
 internet address (IP) every time a
 connection is made.
 
 Almost every Internet Service Provider uses
 this method, so this should be turned on.</source>
         <translation>Selecteer deze optie als deze computer bij iedere
 verbinding dynamisch een IP adres toegewezen
 krijgt.
 
 Bijna iedere provider gebruikt deze optie,
 dus dit moet normaal aan staan.</translation>
     </message>
     <message>
         <source>Static IP address</source>
         <translation>Statisch IP adres</translation>
     </message>
     <message>
         <source>Select this option when your computer has a
 fixed internet address (IP). Most computers
 don&apos;t have this, so you should probably select
 dynamic IP addressing unless you know what you
 are doing.</source>
         <translation>Selecteer deze optie als deze computer een vast
 IP adres heeft. De meeste computers hebben dit
 niet, dus moet in de meeste gevallen dynamisch
 IP adres ingesteld worden.</translation>
     </message>
     <message>
         <source>IP address:</source>
         <translation>IP adres:</translation>
     </message>
     <message>
         <source>If your computer has a permanent internet
 address, you must supply your IP address here.</source>
         <translation>Als deze computer een permanent internet
 adres heeft, kunt u hier uw IP adres invoeren.</translation>
     </message>
     <message>
         <source>Subnet mask:</source>
         <translation>Subnetmasker:</translation>
     </message>
     <message>
         <source>&lt;p&gt;If your computer has a static Internet address,
 you must supply a network mask here. In almost
 all cases this netmask will be &lt;b&gt;255.255.255.0&lt;/b&gt;,
 but your mileage may vary.
 
 If unsure, contact your Internet Service Provider</source>
         <translation>&lt;p&gt;Als deze computer een statisch IP adres heeft,
 moet hier het netwerkmasker ingevuld worden. In bijna
 alle gevallen is dit &lt;b&gt;255.255.255.0&lt;/b&gt;, maar
 het kan anders zijn.
 
 Vraag bij twijfel de provider</translation>
     </message>
     <message>
         <source>Auto-configure hostname from this IP</source>
         <translation>Auto-configureer de hostnaam van dit IP</translation>
     </message>
     <message>
         <source>&lt;p&gt;Whenever you connect, this reconfigures
 your hostname to match the IP address you
 got from the PPP server. This may be useful
 if you need to use a protocol which depends
 on this information, but it can also cause several
 &lt;a href=&quot;kppp-7.html#autohostname&quot;&gt;problems&lt;/a&gt;.
 
 Don&apos;t enable this unless you really need it.</source>
         <translation>&lt;p&gt;Altijd als je verbinding maakt, stelt dit de
 hostnaam in in overeenstemming met het van de
 PPP server verkregen IP adres. Dit kan handig
 zijn bij het gebruik van een protocol dat van deze
 informatie gebruik maakt, maar het kan ook 
 een aantal &lt;a href=&quot;kppp-7.html#autohostname&quot;&gt;problemen&lt;/a&gt; veroorzaken.
 
 Gebruik dit niet indien niet vereist.</translation>
     </message>
     <message>
         <source>Selecting this option might cause some weird problems with the X-server and applications while kppp is connected. Don&apos;t use it until you know what you are doing!
 For more information take a look at the handbook (or help) in the section &quot;Frequently asked questions&quot;.</source>
         <translation>Het selecteren van deze optie kan problemen veroorzaken met de X-server en programma&apos;s tijdens een kppp verbinding. Niet gebruiken indien niet specifiek vereist!
 Zie &quot;Frequently asked questions&quot; in het handboek(of help) voor meer informatie.</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Waarschuwing</translation>
     </message>
 </context>
 <context>
     <name>InterfacePPP</name>
     <message>
         <source>No password</source>
         <translation>Geen wachtwoord</translation>
     </message>
     <message>
         <source>Username defined but no password
  Please enter a password</source>
         <translation>Gebruikersnaam gedefinieerd, maar
 geen wachtwoord. Voer wachtwoord in</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
 </context>
 <context>
     <name>ModemTransfer</name>
     <message>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
 </context>
 <context>
     <name>ModemWidget</name>
     <message>
         <source>Modem &amp;name:</source>
         <translation>Modem&amp;naam:</translation>
     </message>
     <message>
         <source>Modem de&amp;vice:</source>
         <translation>Modema&amp;pparaat:</translation>
     </message>
     <message>
         <source>This specifies the serial port your modem is attached 
 to. On Linux/x86, typically this is either /dev/ttyS0 
 (COM1 under DOS) or /dev/ttyS1 (COM2 under DOS).
 
 If you have an internal ISDN card with AT command
 emulation (most cards under Linux support this), you
 should select one of the /dev/ttyIx devices.</source>
         <translation>Dit geeft de seriele poort weer waar de modem aangesloten is.
 Onder Linux/x86 is dit meestal /dev/ttyS0 (COM1 onder DOS)
 of /dev/ttyS1 (COM2 onder DOS).
 
 Als een interne ISDN kaart met AT commando emulatie gebruikt
 wordt (de meeste Linux apparaten ondersteunen dit), moet er 
 voor een van de /dev/ttylx apparaten gekozen worden.</translation>
     </message>
     <message>
         <source>&amp;Flow control:</source>
         <translation>&amp;Flow control:</translation>
     </message>
     <message>
         <source>Hardware [CRTSCTS]</source>
         <translation>Hardware [CRTSCTS]</translation>
     </message>
     <message>
         <source>Software [XON/XOFF]</source>
         <translation>Software [XON/XOFF]</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Geen</translation>
     </message>
     <message>
         <source>&lt;p&gt;Specifies how the serial port and modem
 communicate. You should not change this unless
 you know what you are doing.
 
 &lt;b&gt;Default&lt;/b&gt;: CRTSCTS</source>
         <translation>&lt;p&gt;Geeft aan hoe de seriele poort en het modem
 moeten communiceren. Laat dit onveranderd als je
 niet zeker weet dat dit gewijzigd moet worden.
 
 &lt;b&gt;Standaard&lt;/b&gt;: CRTSCTS</translation>
     </message>
     <message>
         <source>&amp;Line termination:</source>
         <translation>&amp;Lijnafsluiting:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Specifies how AT commands are sent to your
 modem. Most modems will work fine with the
 default &lt;i&gt;CR/LF&lt;/i&gt;. If your modem does not react
 to the init string, you should try different
 settings here
 
 &lt;b&gt;Default&lt;/b&gt;: CR/LF</source>
         <translation>&lt;p&gt;Geeft aan hoe AT commando&apos;s naar het modem
 verzonden worden. De meeste modems werken goed
 met de standaard &lt;i&gt;CR/LF&lt;/i&gt;. Als het modem niet
 op de init string reageert, moeten er specifiekere
 instellingen worden gemaakt.
 
 &lt;b&gt;Standaard&lt;/b&gt;: CR/LF</translation>
     </message>
     <message>
         <source>Co&amp;nnection speed:</source>
         <translation>Verbi&amp;ndingssnelheid:</translation>
     </message>
     <message>
         <source>Specifies the speed your modem and the serial
 port talk to each other. You should begin with
 the default of 38400 bits/sec. If everything
 works you can try to increase this value, but to
 no more than 115200 bits/sec (unless you know
 that your serial port supports higher speeds).</source>
         <translation>Geeft de snelheid weer waarmee het modem
 en de seriele poort communiceren. Begin met de
 standaardinstelling van 38400 bits/sec. Als dit
 werkt kunnen hogere instelleningen tot
 115200 bits/sec geprobeerd worden (alleen op
 speciale seriele poorten kunnen de hogere standen
 gebruikt worden).</translation>
     </message>
     <message>
         <source>&amp;Use lock file</source>
         <translation>Gebr&amp;uik lock file</translation>
     </message>
     <message>
         <source>&lt;p&gt;To prevent other programs from accessing the
 modem while a connection is established, a
 file can be created to indicate that the modem
 is in use. On Linux an example file would be
 &lt;tt&gt;/var/lock/LCK..ttyS1&lt;/tt&gt;
 Here you can select whether this locking will
 be done.
 
 &lt;b&gt;Default&lt;/b&gt;: On</source>
         <translation>&lt;p&gt;Om te voorkomen dat andere programma&apos;s
 het modem willen aanspreken terwijl het bezig is,
 kan een bestand worden aangemaakt dat aangeeft of
 het modem in gebruik is. Onder linux zou dit bestand
 te vinden zijn als &lt;tt&gt;/var/lock/LCK..ttyS1&lt;/tt&gt;
 Hiermee kan gekozen worden dit wel of niet te
 gebruiken.
 
 &lt;b&gt;Standaard&lt;/b&gt;:Aan</translation>
     </message>
     <message>
         <source>Modem timeout:</source>
         <translation>Modem timeout:</translation>
     </message>
     <message>
         <source> sec</source>
         <translation>sec</translation>
     </message>
     <message>
         <source>This specifies how long &lt;i&gt;kppp&lt;/i&gt; waits for a
 &lt;i&gt;CONNECT&lt;/i&gt; response from your modem. The
 recommended value is 30 seconds.</source>
         <translation>Dit geeft aan hoe lang &lt;i&gt;kppp&lt;/i&gt; wacht op een
 &lt;i&gt;CONNECT&lt;/i&gt; antwoord van het modem.
 De aanbevolen tijd is 30 seconden.</translation>
     </message>
 </context>
 <context>
     <name>ModemWidget2</name>
     <message>
         <source>Busy wait:</source>
         <translation>Wachttijd bij bezet:</translation>
     </message>
     <message>
         <source>&amp;Wait for dial tone before dialing</source>
         <translation>&amp;Wacht op kiestoon voor kiezen</translation>
     </message>
     <message>
         <source>&lt;p&gt;Normally the modem waits for a dial tone
 from your phone line, indicating that it can
 start to dial a number. If your modem does not
 recognize this sound, or your local phone system
 does not emit such a tone, uncheck this option
 
 &lt;b&gt;Default:&lt;/b&gt;: On</source>
         <translation>&lt;p&gt;Normaal wacht het modem op een kiestoon
 van de telefoonlijn, die aangeeft dat het een nummer
 kan gaan kiezen. Als het modem dit geluid niet
 herkent, of het er gewoon niet is, zet deze optie
 dan uit.
 
 &lt;b&gt;Standaard&lt;/b&gt;: Aan</translation>
     </message>
     <message>
         <source> sec</source>
         <translation>sec</translation>
     </message>
     <message>
         <source>Specifies the number of seconds to wait before
 redial if all dialed numbers are busy. This is
 necessary because some modems get stuck if the
 same number is busy too often.
 
 The default is 0 seconds, you should not change
 this unless you need to.</source>
         <translation>Geeft aan hoeveel seconden er gewacht moet
 worden voor de volgende poging als alle gebelde num-
 mers bezet zijn. Dit is nodig omdat sommigge modems
 vasthangen als er te vaak een bezet toon van hetzelfde
 nummer komt.
 
 Standaard is 0 seconden, dit hoeft normaal niet
 veranderd te worden.</translation>
     </message>
     <message>
         <source>Modem &amp;volume:</source>
         <translation>Modem &amp;volume:</translation>
     </message>
     <message>
         <source>Most modems have a speaker which makes
 a lot of noise when dialing. Here you can
 either turn this completely off or select a
 lower volume.
 
 If this does not work for your modem,
 you must modify the modem volume command.</source>
         <translation>De meeste modems hebben een luidspreker
 die een hoop geluid maakt tijdens het kiezen.
 Hier kan dit lager- en uitgeschakeld worden.
 
 Als het modem hierop niet reageert, moet het
 modem volume commando aangepast worden.</translation>
     </message>
     <message>
         <source>Modem asserts CD line</source>
         <translation>Modem monitort CD lijn</translation>
     </message>
     <message>
         <source>This controls how &lt;i&gt;kppp&lt;/i&gt; detects that the modem
 is not responding. Unless you are having
 problems with this, do not modify this setting.
 
 &lt;b&gt;Default&lt;/b&gt;: Off</source>
         <translation>Dit geeft aan hoe &lt;i&gt;kppp&lt;/i&gt; merkt als het modem niet
 reageert. Als je hier geen problemen mee hebt, verander
 deze instelling dan niet.
 
 &lt;b&gt;Standaard&lt;/b&gt;: Uit</translation>
     </message>
     <message>
         <source>Mod&amp;em Commands...</source>
         <translation>Mo&amp;demcommando&apos;s...</translation>
     </message>
     <message>
         <source>Allows you to change the AT command for
 your modem.</source>
         <translation>AT commando van het modem wijzigen.</translation>
     </message>
     <message>
         <source>&amp;Query Modem...</source>
         <translation>&amp;Vraag modeminfo op...</translation>
     </message>
     <message>
         <source>Most modems support the ATI command set to
 find out vendor and revision of your modem.
 
 Press this button to query your modem for
 this information. It can be useful to help
 you setup the modem</source>
         <translation>De meeste modems gebruiken de ATI commando
 set om merk/type en revisiegegevens over te sturen.
 Druk deze knop om het modem deze info te
 vragen. Het kan belangrijk zijn bij het instellen van
 het modem</translation>
     </message>
 </context>
 <context>
     <name>PPPConfigWidget</name>
     <message>
         <source>Configure Modem</source>
         <translation>Configureer modem</translation>
     </message>
     <message>
         <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>
         <translation>Functie:</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Toevoegen</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Standaardinstelling</translation>
     </message>
 </context>
 <context>
     <name>PhoneNumberDialog</name>
     <message>
         <source>Add Phone Number</source>
         <translation>Telefoonummer toevoegen</translation>
     </message>
     <message>
         <source>Enter a phone number:</source>
         <translation>Voer telefoonnummer in:</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>PPP</source>
         <translation>PPP</translation>
     </message>
     <message>
         <source>generic ppp device</source>
         <translation>generiek ppp apparaat</translation>
     </message>
     <message>
         <source>Unable to open modem.</source>
         <translation>Kan modem niet aanspreken.</translation>
     </message>
     <message>
         <source>Unable to detect state of CD line.</source>
         <translation>Kan status van de CD lijn niet uitlezen.</translation>
     </message>
     <message>
         <source>The modem is not ready.</source>
         <translation>Modem is niet gereed.</translation>
     </message>
     <message>
         <source>The modem is busy.</source>
         <translation>Modem is bezet.</translation>
     </message>
     <message>
         <source>Modem Ready.</source>
         <translation>Modem gereed.</translation>
     </message>
     <message>
         <source>Can&apos;t restore tty settings: tcsetattr()
 </source>
         <translation>Kan tty instellingen niet terugzetten: tcsetattr()
 </translation>
     </message>
     <message>
         <source>The modem does not respond.</source>
         <translation>Het modem reageert niet.</translation>
     </message>
     <message>
         <source>Unknown speed</source>
         <translation>onbekende snelheid</translation>
     </message>
     <message>
         <source>ATI Query</source>
         <translation>ATI Quiery</translation>
     </message>
     <message>
         <source>Unable to create modem lock file.</source>
         <translation>Kan modem lock file niet aanmaken.</translation>
     </message>
     <message>
         <source>Looking for modem...</source>
         <translation>Zoek naar modem...</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Annuleer</translation>
     </message>
     <message>
         <source>Modem Query timed out.</source>
         <translation>Modem Query timed out.</translation>
     </message>
     <message>
         <source>Modem device is locked.</source>
         <translation>Modem is gelockt.</translation>
     </message>
     <message>
         <source>Modem Ready</source>
         <translation>Modem gereed</translation>
     </message>
     <message>
         <source>One moment please...</source>
         <translation>Een moment aub...</translation>
     </message>
     <message>
         <source>Modem Query Results</source>
         <translation>Modem Query resutaten</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Sluit</translation>
     </message>
     <message>
         <source>You&apos;re not allowed to dial out with kppp.
 Contact your system administrator.</source>
         <translation>Uitbellen met kppp niet toegestaan.
 Vraag uw systeembeheerder.</translation>
     </message>
     <message>
         <source>Cannot find the PPP daemon!
 Make sure that pppd is installed.</source>
         <translation>Kan PPP daeman niet vinden!
 Controleer of pppd geinstalleerd is.</translation>
     </message>
     <message>
         <source>You do not have the permission to start pppd!
 Contact your system administrator and ask to get access to pppd.</source>
         <translation>Uitbellen met kppp niet toegestaan.
 Vraag uw systeembeheerder, en vraag om pppd toegang.</translation>
     </message>
     <message>
         <source>You don&apos;t have sufficient permission to run
 %1
 Please make sure that kppp is owned by root and has the SUID bit set.</source>
         <translation>Onvoldoende rechten voor hetuitvoeren
 van %1
 Zorg dat kppp het SUID bit heeft, en van root is.</translation>
     </message>
     <message>
         <source>%1 is missing or can&apos;t be read!
 Ask your system administrator to create this file (can be empty) with appropriate read and write permissions.</source>
         <translation>%1 is vermist en kan niet worden gelezen!
 Vraag de systeembeheerder om dit bestand aan te maken (kan leeg zijn) met de juiste lees- en schrijfrechten.</translation>
     </message>
     <message>
         <source>Edit Modem Commands</source>
         <translation>Wijzig modem commando&apos;s</translation>
     </message>
     <message>
         <source>Pre-init delay (sec/100):</source>
         <translation>Pre-init vertraging (sec/100):</translation>
     </message>
     <message>
         <source>Initialization string %1:</source>
         <translation>Instellingsregel %1:</translation>
     </message>
     <message>
         <source>Post-init delay (sec/100):</source>
         <translation>Post-init vertraging (sec/100):</translation>
     </message>
     <message>
         <source>Dialing speed (sec/100):</source>
         <translation>Kiessnelheid (sec/100):</translation>
     </message>
     <message>
         <source>Init response:</source>
         <translation>Init antwoord:</translation>
     </message>
     <message>
         <source>No dial tone detection:</source>
         <translation>Geen kiestoondetectie:</translation>
     </message>
     <message>
         <source>Dial string:</source>
         <translation>Kiesstring:</translation>
     </message>
     <message>
         <source>Connect response:</source>
         <translation>Verbindingsantwoord:</translation>
     </message>
     <message>
         <source>Busy response:</source>
         <translation>Bezig antwoord:</translation>
     </message>
     <message>
         <source>No carrier response:</source>
         <translation>Geen lijnreactie:</translation>
     </message>
     <message>
         <source>No dial tone response:</source>
         <translation>Geen kiestoon:</translation>
     </message>
     <message>
         <source>Hangup string:</source>
         <translation>Ophang string:</translation>
     </message>
     <message>
         <source>Hangup response:</source>
         <translation>Ophangreactie:</translation>
     </message>
     <message>
         <source>Answer string:</source>
         <translation>Antwoordstring:</translation>
     </message>
     <message>
         <source>Ring response:</source>
         <translation>Rinkelantwoord:</translation>
     </message>
     <message>
         <source>Answer response:</source>
         <translation>Opneemantwoord:</translation>
     </message>
     <message>
         <source>Escape string:</source>
         <translation>Escape string:</translation>
     </message>
     <message>
         <source>Escape response:</source>
         <translation>Escape antwoord:</translation>
     </message>
     <message>
         <source>Guard time (sec/50):</source>
         <translation>Wachttijd (sec/50):</translation>
     </message>
     <message>
         <source>Volume off/low/high:</source>
         <translation>Volume uit/laag/hoog:</translation>
     </message>
     <message>
         <source>Connected at:</source>
         <translation>Verbonden met:</translation>
     </message>
     <message>
         <source>Time connected:</source>
         <translation>Tijd verbonden:</translation>
     </message>
     <message>
         <source>Volume:</source>
         <translation>Volume:</translation>
     </message>
     <message>
         <source>Session Bill:</source>
         <translation>Sessiekosten:</translation>
     </message>
     <message>
         <source>Total Bill:</source>
         <translation>Totale kosten:</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>Verbreek verbinding</translation>
     </message>
     <message>
         <source>Byte</source>
         <translation>Byte</translation>
     </message>
     <message>
         <source>KB</source>
         <translation>KB</translation>
     </message>
     <message>
         <source>MB</source>
         <translation>MB</translation>
     </message>
     <message>
         <source>GB</source>
         <translation>GB</translation>
     </message>
     <message>
         <source>Connecting to: </source>
         <translation>Verbinden met:</translation>
     </message>
     <message>
         <source>Online</source>
         <translation>Online</translation>
     </message>
     <message>
         <source>Offline</source>
         <translation>Offline</translation>
     </message>
     <message>
         <source>Log</source>
         <translation>Log</translation>
     </message>
     <message>
         <source>Connecting to: %1</source>
         <translation>Verbinden met: %1</translation>
     </message>
     <message>
         <source>Running pre-startup command...</source>
         <translation>Geef pre-startup commando...</translation>
     </message>
     <message>
         <source>Initializing modem...</source>
         <translation>Instellen modem...</translation>
     </message>
     <message>
         <source>Setting </source>
         <translation>Instelling</translation>
     </message>
     <message>
         <source>Setting speaker volume...</source>
         <translation>Instelling volume...</translation>
     </message>
     <message>
         <source>Turning off dial tone waiting...</source>
         <translation>Schakel wachten op kiestoon uit...</translation>
     </message>
     <message>
         <source>Dialing %1</source>
         <translation>Kiezen %1</translation>
     </message>
     <message>
         <source>Line busy. Hanging up...</source>
         <translation>Lijn bezet. Opgehangen.</translation>
     </message>
     <message>
         <source>Line busy. Waiting: %1 seconds</source>
         <translation>Lijn bezet. Wachten: %1 seconden</translation>
     </message>
     <message>
         <source>No Dialtone</source>
         <translation>Geen kiestoon</translation>
     </message>
     <message>
         <source>No Carrier</source>
         <translation>Geen lijn</translation>
     </message>
     <message>
         <source>Scanning %1</source>
         <translation>Scannen van %1</translation>
     </message>
     <message>
         <source>Saving %1</source>
         <translation>Opslaan van %1</translation>
     </message>
     <message>
         <source>Sending %1</source>
         <translation>Verzenden van %1</translation>
     </message>
     <message>
         <source>Expecting %1</source>
         <translation>Verwacht %1</translation>
     </message>
     <message>
         <source>Pause %1 seconds</source>
         <translation>Pauzeer %1 seconden</translation>
     </message>
     <message>
         <source>Timeout %1 seconds</source>
         <translation>Timeout in %1 seconden</translation>
     </message>
     <message>
         <source>Hangup</source>
         <translation>Ophangen</translation>
     </message>
     <message>
         <source>Answer</source>
         <translation>Beantwoord</translation>
     </message>
     <message>
         <source>ID %1</source>
         <translation>ID %1</translation>
     </message>
     <message>
         <source>Password %1</source>
         <translation>Wachtwoord %1</translation>
     </message>
     <message>
         <source>Prompting %1</source>
         <translation>Invoer %1</translation>
     </message>
     <message>
         <source>PW Prompt %1</source>
         <translation>WW invoer %1</translation>
     </message>
     <message>
         <source>Loop Start %1</source>
         <translation>Loop Start %1</translation>
     </message>
     <message>
         <source>ERROR: Nested too deep, ignored.</source>
         <translation>FOUT: Te diep genest, genegeerd.</translation>
     </message>
     <message>
         <source>Loops nested too deeply!</source>
         <translation>Loops te diep genest!</translation>
     </message>
     <message>
         <source>Loop End %1</source>
         <translation>Loop beeindigd %1</translation>
     </message>
     <message>
         <source>LoopEnd without matching Start! Line: %1</source>
         <translation>LoopEnd zonder Start! regel tegen te komen: %1</translation>
     </message>
     <message>
         <source>Starting pppd...</source>
         <translation>Starten van pppd...</translation>
     </message>
     <message>
         <source>Scan Var: %1</source>
         <translation>Scan Var: %1</translation>
     </message>
     <message>
         <source>Found: %1</source>
         <translation>Gevonden: %1</translation>
     </message>
     <message>
         <source>Looping: %1</source>
         <translation>Looping: %1</translation>
     </message>
     <message>
         <source>Script timed out!</source>
         <translation>Script timeout!</translation>
     </message>
     <message>
         <source>Scanning: %1</source>
         <translation>Zoeken: %1</translation>
     </message>
     <message>
         <source>Expecting: %1</source>
         <translation>Verwacht: %1</translation>
     </message>
     <message>
         <source>Logging on to network...</source>
         <translation>Aanmelden op netwerk...</translation>
     </message>
     <message>
         <source>Running startup command...</source>
         <translation>Startcommando wordt uitgevoerd...</translation>
     </message>
     <message>
         <source>Done</source>
         <translation>Klaar</translation>
     </message>
     <message>
         <source>pppd command + command-line arguments exceed 2024 characters in length.</source>
         <translation>pppd commando + commandoregel argumenten zijn meer dan 2024 tekens lang.</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Cannot find the PPP daemon!&lt;br&gt;Make sure that pppd is installed and that you have entered the correct path.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Kan de PPP daemon niet vinden!&lt;br&gt;Zorg dat pppd geinstalleerd is en het juiste pad bekend is.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Cannot execute:&lt;br&gt; %1&lt;br&gt;Please make sure that you have given setuid permission and that pppd is executable.&lt;br&gt;</source>
         <translation>&lt;qt&gt;Kan niet uitvoeren:&lt;br&gt; %1&lt;br&gt;Zorg ervoor dat SUID ingeschakeld is en pppd uitvoerbaar is.&lt;br&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Cannot find:&lt;br&gt; %1&lt;br&gt;Please make sure you have setup your modem device properly and/or adjust the location of the modem device on the modem tab of the setup dialog.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Kan niet vinden:&lt;br&gt; %1&lt;br&gt;Zorg ervoor dat het modem juist ingesteld is en/of stel de juiste juiste modemverbinding in op het modemtabblad van de instellingsdialoog.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;You have selected the authentication method PAP or CHAP. This requires that you supply a username and a password!&lt;/qt&gt;</source>
         <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>
     </message>
 </context>
 </TS>
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
@@ -1,170 +1,166 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Processorgebruik van programma (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>Processorgebruik van systeem (%)</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Deze pagina laat zien hoeveel de processor 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 device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation>Deze pagina laat zien hoeveel geheugen (RAM) er in gebruik is op dit apparaat.
 Gegeugen wordt geklassificeerd als volgt:
 
 1. Gebruikt - gegeugen gebruikt door Opie en alle andere lopende programma&apos;s.
 2. Buffers - tijdelijke opslag die wordt gebruikt om de performance te verbeteren.
 3. Cached - informatie die recent gebruikt werd, maar nog in reserve gehouden wordt.
 4. Vrij - geheugen dat momenteel niet gebruikt wordt door Opie of andere lopende programma&apos;s.</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Totaal geheugen: %1 kB</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Gebruikt (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Buffers (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Cache (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Vrij (%1 kB)</translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation>Totaal Swap: %1 kB</translation>
     </message>
 </context>
 <context>
     <name>MemoryStatus</name>
     <message>
         <source>Memory Status</source>
         <translation>Geheugenstatus</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Geheugen</translation>
     </message>
     <message>
         <source>Swapfile</source>
         <translation>Swapfile</translation>
     </message>
     <message>
         <source>&lt;center&gt;&lt;b&gt;Memory Monitor Plugin&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Based on source code from:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;This program is licensed under GNU GPL.&lt;/center&gt;</source>
         <translation>&lt;center&gt;&lt;b&gt;Memory Monitor Plugin&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Gebaseerd op broncode van:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;Dit programma valt onder de GNU GPL licentie.&lt;/center&gt;</translation>
     </message>
     <message>
         <source>About</source>
         <translation>Over</translation>
     </message>
 </context>
 <context>
     <name>Swapfile</name>
     <message>
         <source>Swapfile location</source>
         <translation>Plaats van swapfile</translation>
     </message>
     <message>
         <source>RAM</source>
         <translation>RAM</translation>
     </message>
     <message>
         <source>CF Card</source>
         <translation>CF Kaart</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>SD Kaart</translation>
     </message>
     <message>
         <source> On </source>
         <translation>Aan</translation>
     </message>
     <message>
         <source> Off </source>
         <translation>Uit</translation>
     </message>
     <message>
         <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>
         <source>Failed to initialize swapfile.</source>
         <translation>Fout bij aanmelden swapfile.</translation>
     </message>
     <message>
         <source>Swapfile created.</source>
         <translation>Swapfile aangemaakt.</translation>
     </message>
     <message>
         <source>Failed to remove swapfile.</source>
         <translation>Fout bij verwijderen swapfile.</translation>
     </message>
     <message>
         <source>Swapfile removed.</source>
         <translation>Swapfile verwijderd.</translation>
     </message>
     <message>
         <source>Swapfile activated.</source>
         <translation>Swapfile ingeschakeld.</translation>
     </message>
     <message>
         <source></source>
         <translation></translation>
     </message>
     <message>
         <source>2 Mb,4 Mb,6 Mb,8 Mb,16 Mb,32 Mb,64 Mb</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,100 +1,96 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation>Agenda toets</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation>Kontakten toets</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation>Menu toets</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation>Mail toets</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation>Thuis toets</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation>Opname toets</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation>Onder+Omhoog</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation>Onder+Omlaag</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation>Onder+Rechts</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation>Onder+Links</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation>Hoger+Omhoog</translation>
     </message>
     <message>
         <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>
         <source>Todo Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge3</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Trash</source>
         <translation>Afval</translation>
     </message>
 </context>
 </TS>
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
@@ -1,150 +1,76 @@
 <!DOCTYPE TS><TS>
 <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;Ontvangen:&lt;/b&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Accept</source>
         <translation>Accepteer</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation>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>&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>OpieObex::SendWidget</name>
     <message>
         <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;h1&gt;Verzenden:&lt;/h1&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Done</source>
         <translation>Klaar</translation>
     </message>
     <message>
         <source>IrDa is not enabled!</source>
         <translation>IrDa staat niet aan!</translation>
     </message>
     <message>
         <source>Searching for IrDa Devices.</source>
         <translation>Zoek naar IrDa apparaten.</translation>
     </message>
     <message>
         <source>Bluetooth is not available</source>
         <translation>Bluetooth is niet beschikbaar</translation>
     </message>
     <message>
         <source>Searching for bluetooth Devices.</source>
         <translation>Zoek naar bluetooth apparaten.</translation>
     </message>
     <message>
         <source>Scheduling for beam.</source>
         <translation>Plan IrDa verzending.</translation>
     </message>
     <message>
         <source>Click to beam</source>
         <translation>Klik voor IrDa verzending</translation>
     </message>
     <message>
         <source>Sent</source>
         <translation>Verzonden</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Mislukt</translation>
     </message>
     <message>
         <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,1158 +1,727 @@
 <!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>
     </message>
     <message>
         <source>Week</source>
         <translation>Week</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Maand</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Jaar</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Iedere:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Frequentie</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Beeindig op:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Geen einddatum</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Herhaal op</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Ma</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Di</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Wo</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Do</translation>
     </message>
     <message>
         <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>Every</source>
         <translation>Iedere</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Var 1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>WeekVar</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceWidget</name>
     <message>
         <source>No End Date</source>
         <translation>Geen einddatum</translation>
     </message>
     <message>
         <source>days</source>
         <translation>dagen</translation>
     </message>
     <message>
         <source>day</source>
         <translation>dag</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>weken</translation>
     </message>
     <message>
         <source>week</source>
         <translation>week</translation>
     </message>
     <message>
         <source>months</source>
         <translation>maanden</translation>
     </message>
     <message>
         <source>month</source>
         <translation>maand</translation>
     </message>
     <message>
         <source>years</source>
         <translation>jaren</translation>
     </message>
     <message>
         <source>year</source>
         <translation>jaar</translation>
     </message>
     <message>
         <source> and </source>
         <translation>en</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
  en</translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, en</translation>
     </message>
     <message>
         <source>on </source>
         <translation>op</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation>Geen herhaling</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>dag(en)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Herhaal op</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Ma</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Di</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Wo</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Do</translation>
     </message>
     <message>
         <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>week(s)</source>
         <translation>we(e)k(en)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Herhaal op</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dag</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>maand(en)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>ja(a)r(en)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Iedere</translation>
     </message>
 </context>
 <context>
-    <name>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>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to edit the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to duplicate the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to delete the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to transmit the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</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>
         <source>High</source>
         <translation>Hoog</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normaal</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Laag</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation>Heel laag</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Voortgang:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Einddatum:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorie:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation>Standaard email:</translation>
     </message>
     <message>
-        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
-        <translation 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>
         <source>Home Mobile: </source>
         <translation>Prive mobiel:</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation>Alle Emails:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Beroep:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Assistent:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Manager:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Man</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Vrouw</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Geslacht:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Wederhelft:</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Verjaardag:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Jaardag:</translation>
     </message>
     <message>
         <source>Children: </source>
         <translation>Kinderen:</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Bijnaam:</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notities:</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Plaats:</translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation>Deze gebeurtenis duurt de hele dag</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation>Deze gebeurtenis duurt meerdere dagen</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation>Start:</translation>
     </message>
     <message>
         <source>End:</source>
         <translation>Eind:</translation>
     </message>
     <message>
         <source>Note:</source>
         <translation>Notities:</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Iedere</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 iedere</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>De %1 iedere</translation>
     </message>
     <message>
         <source>The %1 %2 of every</source>
         <translation>De %1 %2 van iedere</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Iedere</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Maandag</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Dinsdag</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Woensdag</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Donderdag</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Vrijdag</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Zaterdag</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Zondag</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&lt;br&gt;&lt;b&gt;Werkadres:&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;Prive-adres:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>User Id</source>
         <translation>Gebruikers Id</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>Kategorieen</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Naam Titel</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Voornaam</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Tussenvoegsel</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Achternaam</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Achtervoegsel</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Opslaan als</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Functienaam</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Afdeling</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Bedrijf</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>Default Email</source>
         <translation>Standaard email</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>Emails</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Prive telefoon</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Prive Fax</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Prive mobiel</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Bedrijfs adres</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Bedrijfs stad</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>Bedrijfs provincie</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>Bedrijfs postcode</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>Bedrijfs land</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Bedrijfs pieper</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Bedrijfswebpagina</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Bedrijf</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Beroep</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Assistent</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Manager</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Prive straat</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Prive stad</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>Prive provincie</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>Prive postcode</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>Prive land</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Prive webpagina</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Wederhelft</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Geslacht</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Verjaardag</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Jaardag</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Bijnaam</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Kinderen</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notities</translation>
     </message>
     <message>
         <source>Has a due-date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No due-date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No reccurrence</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No start-date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No completed-date</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>ste</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>de</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>de</translation>
     </message>
     <message>
         <source>th</source>
         <translation>de</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/libopieui2.ts b/i18n/nl/libopieui2.ts
index bfeb96f..627151b 100644
--- a/i18n/nl/libopieui2.ts
+++ b/i18n/nl/libopieui2.ts
@@ -1,892 +1,175 @@
 <!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>
     </message>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation>OTimePickerDialogBase</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished">Naam</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished">Grootte</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Datum</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished">Mime Type</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished">Bestandsdialoog</translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished">Open</translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished">Sla op</translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation>Naam:</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation type="unfinished">Stijl</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished">Grootte</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished">The Quick Brown Fox Jumps Over The Lazy Dog</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished">Stel sleutel in</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="unfinished">Pixmap</translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="unfinished">Naam</translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished">Sleutel</translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished">Standaardsleutel</translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished">Sneltoets voor geselecteerde actie</translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished">Gee&amp;n</translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished">Stan&amp;daard</translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished">&amp;Aangepast</translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished">Stel sleutel in</translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished">Standaard:</translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished">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="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
@@ -1,1062 +1,1005 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Ongesorteerd</translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation>(multi.)</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Werk</translation>
     </message>
     <message>
         <source>Personal</source>
         <translation>Persoonlijk</translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation>(Multi.)</translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>Nieuwe Categorie</translation>
     </message>
     <message>
         <source>New Category </source>
         <translation>Nieuwe Categorie</translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation>Wijzig Categorie</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>Categorieen</translation>
     </message>
     <message>
         <source>Application</source>
         <translation>Programma&apos;s</translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation>Categorieen komen hier</translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation>Controleer de categorieen waar dit document toe behoort.</translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation>Voer hier een nieuwe categorie in. Druk op &lt;b&gt;Voeg toe&lt;/b&gt; om hem aan de lijst toe te voegen.</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Voeg Toe</translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation>Maak links een nieuwe categorie, en druk op deze om hem aan de lijst toe te voegen.</translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation>Druk in om de gekozen categorie te verwijderen.</translation>
     </message>
     <message>
         <source>Global</source>
         <translation>Algemeen</translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation>Vink aan om dit attribuut beschikbaar te maken voor alle programma&apos;s.</translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Ongesorteerd</translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation>Sorry, een ander programma
 vwijzigt al categorieen.</translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation>Wijzig Categorieen</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation>Laat januari in het geselecteerde jaar zien</translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation>Laat de afgelopen maand zien</translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation>Laat de volgende maand zien</translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation>Laat december in het geselecteerde jaar zien</translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation>Sluit de destandskiezer</translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation>Laat bestanden van dit type zien</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Documentaanzicht</translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation>Laat bestanden van deze categorie zien</translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation>Klik om een bestand uit de lijst te selecteren</translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation>, of selecteer &lt;b&gt;Nieuw Document&lt;b/&gt; om een nieuw document te maken.</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation>&lt;br&gt;&lt;br&gt;Houd ingedrukt om documenteigenschappen te zien.</translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation>Naam</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <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>
     </message>
     <message>
         <source>Find what:</source>
         <translation>Vind wat:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categorie:</translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation>Start zoeken op:</translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation>Dec 02 01</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Hoofdlettergevoelig</translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation>Zoek achteruit</translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Properties</source>
         <translation>Eigenschappen</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Documentaanzicht</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation>Verwijderen van bestand mislukt.</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Harde schijf</translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation>Kopie van</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplikaat</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>Bestandskopie mislukt.</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Details</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>Verschuiven van bestand mislukt.</translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation>Details</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation>Gebruik eigen rotatie</translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation>Laad dit bestand alvast in zodat het direct beschkbaar is.</translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation>De naam van dit document.</translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation>De media waarop dit bestand zich bevindt.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Type:</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Locatie:</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Naam:</translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation>Snelladen (gebruikt geheugen)</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>Commentaar:</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation>Verwijder dit document.</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Kopieer</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation>Maak een kopie van dit document.</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Verstuur via IR</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation>Verstuur dit bestand via IR naar een ander apparaat.</translation>
     </message>
     <message>
         <source>Arguments:</source>
         <translation>Argumenten:</translation>
     </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>Informatie over de Eigenaar</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Voer wachtwoord in</translation>
     </message>
 </context>
 <context>
     <name>QMessageBox</name>
     <message>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nee</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>New Document</source>
         <translation>Nieuw Document</translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation>Geen plaats</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>Er is een probleem bij het maken
 van Configuratieinformatie voor
 dit programma.
 
 Maak ruimte vrij, en probeer
 nogmaals.</translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 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>
         <source>year</source>
         <translation>jaar</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Ma</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Di</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Wo</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Do</translation>
     </message>
     <message>
         <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>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Thuisadres:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation>eMailadres:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Telefoon Prive:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Fax Prive:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Mobiel Prive:</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Webpagina Prive:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Webpagina Werk:</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Kantoor:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Telefoon Werk:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Fax Werk:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Mobiel Werk:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Pieper Werk:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Beroep:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Assistent:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Manager:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Man</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Vrouw</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Geslacht:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Echtgeno(o)t(e):</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Verjaardag:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Jaardag:</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Bijnaam:</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Naam Titel</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Voornaam</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Tussenvoegsel</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Achternaam</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Achtervoegsel</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Sla op als</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Functietitel</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Afdeling</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Bedrijf</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Telefoon Werk</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Fax Werk</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Mobiel Werk</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>algemene eMailadres</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>Eamiladressen</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Telefoon Prive</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Fax Prive</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Mobiel Prive</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Werk Straat</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Werk Plaats</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>Werk Provincie</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>Werk Postcode</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>Werk Land</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Pieper Werk</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Webpagina Werk</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Kantoor</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Beroep</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Assistent</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Manager</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Prive Straat</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Prive Plaats</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>Prive Provincie</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>Prive Postcode</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>Prive Land</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Prive Webpagina</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Echtgeno(o)t(e)</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Geslacht</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Verjaardag</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Jaardag</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Bijnaam</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <source>Jan</source>
         <translation>jan</translation>
     </message>
     <message>
         <source>Feb</source>
         <translation>feb</translation>
     </message>
     <message>
         <source>Mar</source>
         <translation>mar</translation>
     </message>
     <message>
         <source>Apr</source>
         <translation>apr</translation>
     </message>
     <message>
         <source>May</source>
         <translation>mei</translation>
     </message>
     <message>
         <source>Jun</source>
         <translation>jun</translation>
     </message>
     <message>
         <source>Jul</source>
         <translation>jul</translation>
     </message>
     <message>
         <source>Aug</source>
         <translation>aug</translation>
     </message>
     <message>
         <source>Sep</source>
         <translation>sep</translation>
     </message>
     <message>
         <source>Oct</source>
         <translation>okt</translation>
     </message>
     <message>
         <source>Nov</source>
         <translation>nov</translation>
     </message>
     <message>
         <source>Dec</source>
         <translation>dec</translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation type="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>
     </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;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>
         <source>Move</source>
         <translation>Verplaats</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Grootte</translation>
     </message>
     <message>
         <source>Maximize</source>
         <translation>Maximaliseer</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Sluit</translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>CF Kaart</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Harddisk</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>SD Kaart</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>MMC Kaart</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>SCSI Harddisk</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>Intern geheugen</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Interne opslag</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>Geen</translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation>Tijdzoneprogramma niet gevonden</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation>Om de tijdzones te kunnen kiezen
 moet u het programma citytime
 installeren.</translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Geen plaats</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Kan alarm niet instellen.
 Maak ruimte vrij, en probeer het nogmaals</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>%1 files</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>%1 %1
 
 ninor mimetype / major mimetype</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>Alle %1 bestanden</translation>
     </message>
     <message>
         <source>All files</source>
         <translation>Alle bestanden</translation>
     </message>
 </context>
 <context>
     <name>WindowDecoration</name>
     <message>
         <source>Default</source>
         <comment>List box text for default window decoration</comment>
         <translation>Standaard
 
 Keuzevlak tekst voor standaard vensterdecoratie</translation>
     </message>
 </context>
 </TS>
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,114 +1,102 @@
 <!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>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation>Deze kleur zal worden gebruikt voor verjaardagen/jaardagen!</translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation>Stel urgentkleur in
 als minder dan</translation>
     </message>
     <message>
         <source> days: </source>
         <translation>dagen:</translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation>Deze urgentkleur zal worden gebruikt als de taak dichtbij is!</translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation>De urgentkleur wordt gebruikt als de verjaardag/jaardag dichterbij is dan het aangegeven aantal dagen!</translation>
     </message>
     <message>
         <source>Enable/Disable Views</source>
         <translation>In- en Uitschakelen aanzicht</translation>
     </message>
     <message>
         <source>Show &amp;Birthdays</source>
         <translation>Laat &amp;Verjaardagen zien</translation>
     </message>
     <message>
         <source>Show &amp;Anniveraries</source>
         <translation>Laat &amp;Feestdagen zien</translation>
     </message>
     <message>
         <source>The next birthdays will just be shown, if enabled!</source>
         <translation>Verjaardagen zijn alleen zichtbaar indien ingeschakeld!</translation>
     </message>
     <message>
         <source>The next anniversaries will just be shown, if enabled !</source>
         <translation>Feestdagen zijn alleen zichtbaar indien ingeschakeld!</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>AddressBook plugin</source>
         <translation>Adresboek plugin</translation>
     </message>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>Volgende verjaardagen in komende &lt;b&gt;%1&lt;/b&gt; dagen:</translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>Geen verjaardagen in komende &lt;b&gt;%1&lt;/b&gt; dagen!</translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>Volgende jaardagen in komende &lt;b&gt;%1&lt;/b&gt; dagen:</translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>Geen jaardagen in komende &lt;b&gt;%1&lt;/b&gt; dagen!</translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation>Database biedt deze zoekopdracht niet! libOpie upgraden aub!&lt;br&gt;</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/libtodaydatebookplugin.ts b/i18n/nl/libtodaydatebookplugin.ts
index 40772f3..a3c5a66 100644
--- a/i18n/nl/libtodaydatebookplugin.ts
+++ b/i18n/nl/libtodaydatebookplugin.ts
@@ -1,146 +1,87 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <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>
     </message>
     <message>
         <source>Show notes</source>
         <translation>Laat notitie zien</translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
         <translation>Klik hier als iedere afspraak met notitie weergegeven moet worden</translation>
     </message>
     <message>
         <source>Show only later appointments</source>
         <translation></translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
         <translation>Klik hier als alleen afspraken later dan de huidige tijd weergegeven moeten worden</translation>
     </message>
     <message>
         <source>Show time in extra line</source>
         <translation>Laat tijd in extra regel zien</translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
         <translation>Hoeveel afspraken moeten maximaal worden weergegeven. Chronologisch</translation>
     </message>
     <message>
         <source>How many appointment should be shown?</source>
         <translation>Hoeveel afspraken moeten worden weergegeven?</translation>
     </message>
     <message>
         <source>only today</source>
         <translation>alleen vandaag</translation>
     </message>
     <message>
         <source>How many more days should be in the range</source>
         <translation>Hoeveel dagen moeten verder in de reeks zitten</translation>
     </message>
     <message>
         <source>How many more days</source>
         <translation>Hoeveel verdere dagen</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Datebook plugin</source>
         <translation>Agendaplugin</translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation>Geen afspraken meer vandaag</translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation>Geen afspraken vandaag</translation>
     </message>
 </context>
 </TS>
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
@@ -1,59 +1,40 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>Todolist plugin</source>
         <translation>Te Doen-lijst plugin</translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation>Er is &lt;b&gt; 1&lt;/b&gt; actieve taak:  &lt;br&gt;</translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation>Er zijn &lt;b&gt; %1&lt;/b&gt; achtieve taken:  &lt;br&gt;</translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation>Geen actieve taken</translation>
     </message>
 </context>
 <context>
     <name>TodoPluginConfigBase</name>
     <message>
         <source>Set the maximum number of task that should be shown</source>
         <translation>Stel het maximum aantal te tonen taken in</translation>
     </message>
     <message>
         <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
@@ -1,121 +1,117 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>Weather plugin</source>
         <translation>Weerplugin</translation>
     </message>
 </context>
 <context>
     <name>WeatherPluginConfig</name>
     <message>
         <source>Enter ICAO location identifier:</source>
         <translation>Voer ICAO locatienummer in:</translation>
     </message>
     <message>
         <source>Enter the 4 letter code for the desired location here.  See http://www.nws.noaa.gov/tg/siteloc.shtml to find a location near you.</source>
         <translation>Voer de 4 lettercode van de gewenste plaats in. Zie http://www.nws.noaa.gov/tg/siteloc.shtml om een locatie in de buurt te vinden.</translation>
     </message>
     <message>
         <source>Visit http://www.nws.noaa.gov/tg/siteloc.shtml to find the nearest location.</source>
         <translation>Bezoek http://www.nws.noaa.gov/tg/siteloc.shtml om de dichtstbijzijnde plaats te vinden.</translation>
     </message>
     <message>
         <source>Use metric units</source>
         <translation>Gebruik metrische eenheden</translation>
     </message>
     <message>
         <source>Click here to select type of units displayed.</source>
         <translation>Klik hier om het soort eenheden te kiezen.</translation>
     </message>
     <message>
         <source>Update frequency (in minutes):</source>
         <translation>Updatefrequentie (in minuten):</translation>
     </message>
     <message>
         <source>Select how often (in minutes) you want the weather to be updated.</source>
         <translation>Selecteer hoe vaak (in minuten) het weer moet worden geupdate.</translation>
     </message>
 </context>
 <context>
     <name>WeatherPluginWidget</name>
     <message>
         <source>Retreiving current weather information.</source>
         <translation>Ophalen recente weerinformatie.</translation>
     </message>
     <message>
         <source>Temp: </source>
         <translation>Temp:</translation>
     </message>
     <message>
         <source>  Wind: </source>
         <translation>Wind:</translation>
     </message>
     <message>
         <source>
 Pres: </source>
         <translation>
 Luchtdruk:</translation>
     </message>
     <message>
         <source>Current weather data not available.</source>
         <translation>Recente weerinformatie niet beschikbaar.</translation>
     </message>
     <message>
         <source>n/a</source>
         <translation>n/b</translation>
     </message>
     <message>
         <source>E </source>
         <translation>O</translation>
     </message>
     <message>
         <source>NE </source>
         <translation>NO</translation>
     </message>
     <message>
         <source>N </source>
         <translation>N</translation>
     </message>
     <message>
         <source>NW </source>
         <translation>NW</translation>
     </message>
     <message>
         <source>W </source>
         <translation>W</translation>
     </message>
     <message>
         <source>SW </source>
         <translation>ZW</translation>
     </message>
     <message>
         <source>S </source>
         <translation>Z</translation>
     </message>
     <message>
         <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
@@ -1,48 +1,36 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MindBreaker</name>
     <message>
         <source>New Game</source>
         <translation>Nieuw spel</translation>
     </message>
     <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>
         <source>Cancel</source>
         <translation>Cancel</translation>
     </message>
 </context>
 </TS>
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,37 +1,33 @@
 <!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>
         <source>Game</source>
         <translation>Spel</translation>
     </message>
     <message>
         <source>Mine Sweep</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -410,523 +410,503 @@
     <message>
         <source>Device</source>
         <translation>Apparaat</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Configure Profiles</source>
         <translation>Configureer profielen</translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation>Nieuwe verbinding</translation>
     </message>
     <message>
         <source>Save Connection</source>
         <translation>Sal verbinding op</translation>
     </message>
     <message>
         <source>Connect</source>
         <translation>Verbind</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>Verbreek</translation>
     </message>
     <message>
         <source>QuickLaunch</source>
         <translation>SnelStarten</translation>
     </message>
     <message>
         <source>The shell button launches the &quot;default&quot; profile. If there is none default values are taken</source>
         <translation>Te shell knop start het &quot;standaard&quot; profiel. Als er geen is worden standaardwaarden genomen</translation>
     </message>
     <message>
         <source>Transfer file...</source>
         <translation>Verzend bestand...</translation>
     </message>
     <message>
         <source>Line wrap</source>
         <translation>Lijnafbreking</translation>
     </message>
     <message>
         <source>Full screen</source>
         <translation>Volledig scherm</translation>
     </message>
     <message>
         <source>Save history</source>
         <translation>Sla historie op</translation>
     </message>
     <message>
         <source>Terminate</source>
         <translation>Beeindig</translation>
     </message>
     <message>
         <source>Close Window</source>
         <translation>Sluit venster</translation>
     </message>
     <message>
         <source>Run Script</source>
         <translation>Speel script af</translation>
     </message>
     <message>
         <source>Record Script</source>
         <translation>Neem script op</translation>
     </message>
     <message>
         <source>Save Script</source>
         <translation>Sla script op</translation>
     </message>
     <message>
         <source>Open Keyboard...</source>
         <translation>Open toetsenbord...</translation>
     </message>
     <message>
         <source>New from Profile</source>
         <translation>Nieuw van profiel</translation>
     </message>
     <message>
         <source>Connection</source>
         <translation>Verbinding</translation>
     </message>
     <message>
         <source>Scripts</source>
         <translation>Scripts</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Kopieer</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Plak</translation>
     </message>
     <message>
         <source>Script</source>
         <translation>Script</translation>
     </message>
     <message>
         <source>&lt;qt&gt;There is no Connection.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Er is geen verbinding.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>History</source>
         <translation>Geschiedenis</translation>
     </message>
     <message>
         <source>New Profile</source>
         <translation>Nieuw Profiel</translation>
     </message>
     <message>
         <source>Save Profile</source>
         <translation>Bewaar Profiel</translation>
     </message>
     <message>
         <source>Start log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Log</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModemConfigWidget</name>
     <message>
         <source>Modem is attached to:</source>
         <translation>Modem is verbonden met:</translation>
     </message>
     <message>
         <source>Enter telefon number here:</source>
         <translation>Voer telefoonnummer hier in:</translation>
     </message>
     <message>
         <source>AT commands</source>
         <translation>AT commando&apos;s</translation>
     </message>
     <message>
         <source>Enter number</source>
         <translation>Voer nummer in</translation>
     </message>
 </context>
 <context>
     <name>NoOptions</name>
     <message>
         <source>This Plugin does not support any configurations</source>
         <translation>Deze plugin ondersteunt geen configuraties</translation>
     </message>
 </context>
 <context>
     <name>ProfileEditorDialog</name>
     <message>
         <source>Connection</source>
         <translation>Verbinding</translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
         <source>Auto connect after load</source>
         <translation>Autoconnect na laden</translation>
     </message>
     <message>
         <source>Local Console</source>
         <translation>Lokale Console</translation>
     </message>
     <message>
         <source>New Profile</source>
         <translation>Nieuw Profiel</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Opie Console</source>
         <translation>Opie Console</translation>
     </message>
     <message>
         <source>Failed</source>
         <translation>Mislukt</translation>
     </message>
     <message>
         <source>Connecting failed for this session.</source>
         <translation>Verbinding mislukt voor deze sessie.</translation>
     </message>
     <message>
         <source>Session failed</source>
         <translation>Sessie mislukt</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Cannot open session: Not all components were found.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Kan sessie niet openen: Niet alle componenten zijn gevonden.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Transfer mode</source>
         <translation>Verzendingsmodus</translation>
     </message>
     <message>
         <source>Send</source>
         <translation></translation>
     </message>
     <message>
         <source>Receive</source>
         <translation>Ontvang</translation>
     </message>
     <message>
         <source>Send file</source>
         <translation>Zend bestand</translation>
     </message>
     <message>
         <source>Transfer protocol</source>
         <translation>Verzendingsprotocol</translation>
     </message>
     <message>
         <source>Progress</source>
         <translation>Voortgang</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
         <source>Ready</source>
         <translation>Klaar</translation>
     </message>
     <message>
         <source>Start transfer</source>
         <translation>Start verzenden</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Annuleer</translation>
     </message>
     <message>
         <source>File transfer</source>
         <translation>Bestandsverzending</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation>Attentie</translation>
     </message>
     <message>
         <source>No file has been specified.</source>
         <translation>Geen bestand is gekozen.</translation>
     </message>
     <message>
         <source>Sending...</source>
         <translation>Zenden...</translation>
     </message>
     <message>
         <source>Receiving...</source>
         <translation>Ontvangen...</translation>
     </message>
     <message>
         <source>Cancelled</source>
         <translation>Geannuleerd</translation>
     </message>
     <message>
         <source>The file transfer has been cancelled.</source>
         <translation>De bestandsverzending is geannuleerd.</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
         <source>Operation not supported.</source>
         <translation>Aktie niet ondersteund.</translation>
     </message>
     <message>
         <source>Transfer could not be started.</source>
         <translation>Verzending kan niet worden gestart.</translation>
     </message>
     <message>
         <source>No error.</source>
         <translation>Geen fout.</translation>
     </message>
     <message>
         <source>Undefined error occured.</source>
         <translation>Ongedefinieerde fout opgetreden.</translation>
     </message>
     <message>
         <source>Incomplete transfer.</source>
         <translation>Incomplete verzending.</translation>
     </message>
     <message>
         <source>Unknown error occured.</source>
         <translation>Onbekende fout opgetreden.</translation>
     </message>
     <message>
         <source>Sent</source>
         <translation>Verzonden</translation>
     </message>
     <message>
         <source>File has been sent.</source>
         <translation>Bestand is verzonden.</translation>
     </message>
     <message>
         <source>Received</source>
         <translation>Ontvangen</translation>
     </message>
     <message>
         <source>File has been received.</source>
         <translation>Bestand is ontvangen.</translation>
     </message>
     <message>
         <source>Profile name</source>
         <translation>Profielnaam</translation>
     </message>
     <message>
         <source>Profile</source>
         <translation>Profiel</translation>
     </message>
     <message>
         <source>Connection</source>
         <translation>Verbinding</translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
         <source>Special Keys</source>
         <translation>Speciale toetsen</translation>
     </message>
     <message>
         <source>Invalid profile</source>
         <translation>Fout profiel</translation>
     </message>
     <message>
         <source>Please enter a profile name.</source>
         <translation>Voer een profielnaam in aub.</translation>
     </message>
     <message>
         <source>Z-Modem</source>
         <translation>Z-Modem</translation>
     </message>
     <message>
         <source>Y-Modem</source>
         <translation>Y-Modem</translation>
     </message>
     <message>
         <source>X-Modem</source>
         <translation>X-Modem</translation>
     </message>
     <message>
         <source>Serial</source>
         <translation>Serieel</translation>
     </message>
     <message>
         <source>Modem</source>
         <translation>Modem</translation>
     </message>
     <message>
         <source>Local Console</source>
         <translation>Lokale console</translation>
     </message>
     <message>
         <source>Default Terminal</source>
         <translation>Standaard terminal</translation>
     </message>
     <message>
         <source>Default Keyboard</source>
         <translation>Standaard toetsenbord</translation>
     </message>
     <message>
         <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>
         <source>Reset speakers</source>
         <translation>Herstel speakers</translation>
     </message>
     <message>
         <source>Turning off dialtone</source>
         <translation>Schakel beltoon uit</translation>
     </message>
     <message>
         <source>Dial number</source>
         <translation>Te bellen nummer</translation>
     </message>
     <message>
         <source>Line busy, redialing number</source>
         <translation>Lijn bezet, opnieuw inbellen</translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation>Verbinding gemaakt</translation>
     </message>
     <message>
         <source>Dismiss</source>
         <translation>Sluit af</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Dialing the number failed.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fixing up Embedix</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SerialConfigWidget</name>
     <message>
         <source>Device</source>
         <translation>Apparaat</translation>
     </message>
 </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>
         <source>Options</source>
         <translation>Opties</translation>
     </message>
     <message>
         <source>Local echo</source>
         <translation>Lokale echo</translation>
     </message>
     <message>
         <source>Line wrap</source>
         <translation>Lijnafbreking</translation>
     </message>
     <message>
         <source>VT 100</source>
         <translation>VT 100</translation>
     </message>
     <message>
         <source>VT 102</source>
         <translation>VT 102</translation>
     </message>
     <message>
         <source>Linux Console</source>
         <translation>Linux console</translation>
     </message>
     <message>
         <source>X-Terminal</source>
         <translation>X_Terminal</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>green on black</source>
         <translation>groen op zwart</translation>
     </message>
     <message>
         <source>orange on black</source>
         <translation>oranje op zwart</translation>
     </message>
 </context>
 </TS>
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
@@ -1,316 +1,328 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BaseSetup</name>
     <message>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slideshow timeout:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Toggle autoscale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to next image</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Delete Current Item</source>
         <translation>Verwijder huidig object</translation>
     </message>
     <message>
         <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>
         <source>Imageinfo Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Imageview Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Go dir up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start slideshow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and Imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show images fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto rotate images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show images unscaled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show zoomer window when unscaled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>&lt;center&gt;&lt;b&gt;Be carefull with the following options!&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show files recursive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recursion depth:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Digital Camera View</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Name Only</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>imageinfo</name>
     <message>
         <source>View Full Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays an thumbnail of the image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays info of selected image</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,423 +1,267 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Title</source>
         <translation>Titel</translation>
     </message>
     <message>
         <source>Author</source>
         <translation>Auteur</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Omschrijving</translation>
     </message>
     <message>
         <source>Copyright</source>
         <translation>Copyright</translation>
     </message>
     <message>
         <source>Creation Time</source>
         <translation>Creatietijd</translation>
     </message>
     <message>
         <source>Software</source>
         <translation>Programma</translation>
     </message>
     <message>
         <source>Disclaimer</source>
         <translation>Disclaimer</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Waarschuwing</translation>
     </message>
     <message>
         <source>Source</source>
         <translation>Bron</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Commentaar</translation>
     </message>
     <message>
         <source>Grayscale</source>
         <translation>Grijsschaal</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Onbekend</translation>
     </message>
     <message>
         <source>RGB</source>
         <translation>RGB</translation>
     </message>
     <message>
         <source>Palette</source>
         <translation>Palet</translation>
     </message>
     <message>
         <source>Grayscale/Alpha</source>
         <translation>Grayscale/Alpha</translation>
     </message>
     <message>
         <source>RGB/Alpha</source>
         <translation>RGB/Alpha</translation>
     </message>
     <message>
         <source>Deflate</source>
         <translation>Inpakken</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Geen</translation>
     </message>
     <message>
         <source>Adam7</source>
         <translation>Adam7</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Not a GIF file</source>
         <translation>Geen GIF bestand</translation>
     </message>
     <message>
         <source>Dimensions: %1x%2
 </source>
         <translation>Dimensies: %1x%2
 </translation>
     </message>
     <message>
         <source>Depth: %1 bits
 </source>
         <translation>Diepte: %1 Bits
 </translation>
     </message>
     <message>
         <source>Sort Flag: %1
 </source>
         <translation>Sorteervlag: %1
 </translation>
     </message>
     <message>
         <source>Size of Global Color Table: %1 colors
 </source>
         <translation>Grotte van Globale kleurtabel: %1 kleuren
 </translation>
     </message>
     <message>
         <source>Background Color Index: %1
 </source>
         <translation>Achtergrondkleur index: %1
 </translation>
     </message>
     <message>
         <source>Pixel Aspect Ratio: %1 (Aspect Ratio %2)
 </source>
         <translation>Pixel Aspect Ratio: %1 (Aspect Ratio %2)
 </translation>
     </message>
     <message>
         <source>Comment: %1
 </source>
         <translation>Commentaar: %1
 </translation>
     </message>
     <message>
         <source>Depth: %1
 </source>
         <translation>Diepte: %1
 </translation>
     </message>
     <message>
         <source>ColorMode: %1
 </source>
         <translation>Kleurmodus: %1
 </translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Onbekend</translation>
     </message>
     <message>
         <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>
         <source>Manufacturer: %1
 </source>
         <translation>Merk: %1</translation>
     </message>
     <message>
         <source>Model: %1
 </source>
         <translation>Model: %1
 </translation>
     </message>
     <message>
         <source>Orientation: %1
 </source>
         <translation>Orientatie: %1
 </translation>
     </message>
     <message>
         <source>Flash used
 </source>
         <translation>Flits gebruikt
 </translation>
     </message>
     <message>
         <source>Focal length: %1
 </source>
         <translation>Brandpunt: %1
 </translation>
     </message>
     <message>
         <source>35mm equivalent: %1
 </source>
         <translation>35mm equivalent: %1
 </translation>
     </message>
     <message>
         <source>CCD width: %1</source>
         <translation>CCD breedte: %1</translation>
     </message>
     <message>
         <source>Exposure time: %1
 </source>
         <translation>Belichtingstijd: %1</translation>
     </message>
     <message>
         <source>Aperture: %1
 </source>
         <translation>Aperture: %1</translation>
     </message>
     <message>
         <source>Distance: %1
 </source>
         <translation>Afstand: %1
 </translation>
     </message>
     <message>
         <source>Infinite</source>
         <translation>Oneindig</translation>
     </message>
     <message>
         <source>ISO equivalent: %1
 </source>
         <translation>ISO equivalent: %1
 </translation>
     </message>
     <message>
         <source>EXIF comment: %1</source>
         <translation>EXIF commentaar: %1</translation>
     </message>
     <message>
         <source>&lt;/qt&gt;</source>
         <translation>&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Dimensions: %1 x %2
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compressed size: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>used colors: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Resolution: %1 x %2
 </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,148 +1,125 @@
 <!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>
         <source>User</source>
         <translation>Naam</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Wachtwoord</translation>
     </message>
     <message>
         <source>Suspend</source>
         <translation>Slaapstand</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Menu</translation>
     </message>
 </context>
 <context>
     <name>LoginWindowImpl</name>
     <message>
         <source>Restart</source>
         <translation>Herstart</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>Stop</translation>
     </message>
     <message>
-        <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
-        <translation 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>
     <message>
         <source>&lt;b&gt;Password:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Confirm:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PasswordDialogImpl</name>
     <message>
         <source>Trying to leave without password set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;No password was set. This could lead to you not beeingable to remotely connect to your machine.Do you want to continue not setting a password?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passwords don&apos;t match</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The two passwords don&apos;t match. Please try again.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password not legal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The entered password is not a valid password.Please try entering a valid password.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,793 +1,721 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DCCProgress</name>
     <message>
         <source>Receiving file %1 from %2...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully received %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Peer Aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Timeout</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DCCTransferTab</name>
     <message>
         <source>DCC Transfers in Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are transfers in progress. &lt;br&gt;If you close this tab, they will be canceled.&lt;br&gt;Do you want to close it anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DCC Transfer from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is trying to send you the file %2
 (%3 bytes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Reject</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCChannelTab</name>
     <message>
         <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>
         <source>Whois</source>
         <translation>Whois</translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation>Verbinding verbroken</translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
         <translation>Verbonden, log nu in...</translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
         <translation>Succcesvol ingelogd.</translation>
     </message>
     <message>
         <source>Socket error : </source>
         <translation>Socket error:</translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation>Verbinding verbroken</translation>
     </message>
 </context>
 <context>
     <name>IRCHistoryLineEdit</name>
     <message>
         <source>Next Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Mode change has unknown type</source>
         <translation>Modus is van onbekend type</translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
         <translation>Modusverandering met onbekend persoon - synchronisatie verloren?</translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
         <translation>Modusverandering met onbekende vlag</translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
         <translation>Modusverandering met onbekend kanaal - synchronisatie verloren?</translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
         <translation>User modes worden nog niet ondersteund</translation>
     </message>
     <message>
         <source>You were kicked from </source>
         <translation>U werd ge-kick-t van</translation>
     </message>
     <message>
         <source> by </source>
         <translation>door</translation>
     </message>
     <message>
         <source> was kicked from </source>
         <translation>is ge-kick-t van</translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
         <translation>Onbekend persoon is ge-kick-t - synchronisatie verloren?</translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
         <translation>Onbekende kick op kanaal - synchronisatie verloren?</translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
         <translation>Serverbericht voor onbekend kanaal</translation>
     </message>
     <message>
         <source>You joined channel </source>
         <translation>U opent kanaal</translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
         <translation>Bijnaam is in gebruik, sluit opnieuw aan met een andere bijnaam</translation>
     </message>
     <message>
         <source>No such nickname</source>
         <translation>Bijnaam niet bekend</translation>
     </message>
     <message>
         <source>Received unhandled numeric command: %1</source>
         <translation>Ongebruikt nummeriek commando ontvangen: %1</translation>
     </message>
     <message>
         <source>Received unhandled ctcp command: %1</source>
         <translation>Ongebruikt CTCP commando ontvangen: %1</translation>
     </message>
     <message>
         <source>Received unhandled literal command: %1</source>
         <translation>Ongebruikt Tekstueel commando ontvangen: %1</translation>
     </message>
     <message>
         <source>%1 joined channel %2</source>
         <translation>%1 opent kanaal %2</translation>
     </message>
     <message>
         <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>
         <source>There are %1 unknown connection(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are %1 channels formed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait a while and try again</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Whois %1 (%2@%3)
 Real name: %4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is using server %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is on channels: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Names for %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time on server %1 is %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel or nick %1 doesn&apos;t exists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is no history information for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t change nick to %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You&apos;re not on channel %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>[%1] Operation not permitted, you don&apos;t have enough channel privileges</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connected to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 has been idle for %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 signed on %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP PING with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP PING with unknown channel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP PING with bad recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP VERSION request from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING reply from %1: %2 seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malformed DCC request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
         <translation>Spreek met</translation>
     </message>
     <message>
         <source>Private discussion</source>
         <translation>Privegesprek</translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
         <translation>Type je tekst hier om een bericht aan de andere persoon te zenden</translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation>Verbinding verbroken</translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
         <translation>Profielnaam:</translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
         <translation>De naam van dit serverprofiel in het overzicht</translation>
     </message>
     <message>
         <source>Hostname :</source>
         <translation>Hostnaam:</translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
         <translation>De server om mee te verbinden - kan iedere geldige hostnaam of IP adres zijn</translation>
     </message>
     <message>
         <source>Port :</source>
         <translation>Poort:</translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
         <translation>De serverpoort om mee te verbinden. Gewoonlijk 6667</translation>
     </message>
     <message>
         <source>Nickname :</source>
         <translation>Bijnaam:</translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
         <translation>Je naam op het IRC netwerk</translation>
     </message>
     <message>
         <source>Realname :</source>
         <translation>Echte naam:</translation>
     </message>
     <message>
         <source>Your real name</source>
         <translation>Uw echte naam</translation>
     </message>
     <message>
         <source>Password :</source>
         <translation>Wachtwoord:</translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
         <translation>Wachtwoord om met de server te verbinden (indien nodig)</translation>
     </message>
     <message>
         <source>Channels :</source>
         <translation>Kanalen:</translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
         <translation>Komma-gescheiden (CSV) lijst van kanalen die je je automatisch wilt aansluiten</translation>
     </message>
     <message>
         <source>Edit server information</source>
         <translation>Wijzig serverinformatie</translation>
     </message>
     <message>
         <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>
         <translation>Serverlijst browser</translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
         <translation>Kies een serverprofiel</translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
         <translation>Selecteer een severprofiel uit de lijst en druk dan op OK in de hoek rechtsboven</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Wijzig</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Voeg toe</translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
         <translation>Verwijder het geselecteerde serverprofiel</translation>
     </message>
     <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>
 <context>
     <name>IRCSession</name>
     <message>
         <source>You are now known as %1</source>
         <translation type="unfinished">U staat nu bekend als %1</translation>
     </message>
     <message>
         <source>Nickname change of an unknown person</source>
         <translation type="unfinished">Bijnaamverandering van een onbekend persoon</translation>
     </message>
     <message>
         <source>%1 is now known as %2</source>
         <translation type="unfinished">%1 staat nu bekend als %2</translation>
     </message>
 </context>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Lines displayed :</source>
         <translation>Weergegeven lijnen:</translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
         <translation>Aantal lijnen die worden weergegeven voordat oude lijnen worden verwijderd - dit is nodig om geheugengebruik te beperken. Stel in op 0 als dit niet nodig is</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Algemeen</translation>
     </message>
     <message>
         <source>Background color :</source>
         <translation>Achtergrondkleur:</translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
         <translation>De te gebruiken achtergrondkleur in chats</translation>
     </message>
     <message>
         <source>Normal text color :</source>
         <translation>Normale tekstkleur:</translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
         <translation>De te gebruiken tekstkleur in chats</translation>
     </message>
     <message>
         <source>Error color :</source>
         <translation>Foutkleur:</translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
         <translation>Tekstkleur om te gebruiken om fouten weer te geven</translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
         <translation>Door jezelf geschreven tekst:</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
         <translation>Tekstkleur om je eigengeschreven tekst mee te herkennen</translation>
     </message>
     <message>
         <source>Text written by others :</source>
         <translation>Door anderen geschreven tekst:</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
         <translation>Tekstkleur om door anderen geschreven tekst mee te herkennen</translation>
     </message>
     <message>
         <source>Text written by the server :</source>
         <translation>Door de server geschreven tekst:</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
         <translation>Tekstkleur om door de server geschreven tekst mee te herkennen</translation>
     </message>
     <message>
         <source>Notifications :</source>
         <translation>Berichtgevingen:</translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
         <translation>Tekstkleur om te gebruiken om berichtgevingen weer te geven</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Kleuren</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Instellingen</translation>
     </message>
     <message>
         <source>Display time in chat log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Keyboard Shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCTab</name>
     <message>
         <source>Missing description</source>
         <translation>Missende omschrijving</translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
         <translation>Beschrijving van de inhoud van deze tab</translation>
     </message>
     <message>
         <source>Close this tab</source>
         <translation>Sluit deze tab</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
         <translation>IRC Client</translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
         <translation>Serververbindingen, kanalen, quieries en andere dingen worden hier geplaatst</translation>
     </message>
     <message>
         <source>IRC</source>
         <translation>IRC</translation>
     </message>
     <message>
         <source>New connection</source>
         <translation>Nieuwe verbinding</translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
         <translation>Maak een nieuwe verbinding met een IRC server</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Instellingen</translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
         <translation>Stel OpieIRC&apos;s gedrag en uiterlijk in</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source> User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie IRC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> gives channel operator status to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> removes channel operator status from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> gives voice to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> removes voice from </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,829 +1,878 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AccountView</name>
     <message>
         <source>Error creating new Folder</source>
         <translation>Fout bij maken van map</translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation>&lt;center&gt;Fout bij maken van&lt;br&gt;map - afgebroken.&lt;/center&gt;</translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation>Het adresboek is leeg.</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Minimaal een adres selecteren&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
 </context>
 <context>
     <name>AddressPickerUI</name>
     <message>
         <source>Address Picker</source>
         <translation>Adreszoeker</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Annuleren</translation>
     </message>
 </context>
 <context>
     <name>ComposeMail</name>
     <message>
         <source>Name</source>
         <translation>Naam</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Grootte</translation>
     </message>
     <message>
         <source>Problem</source>
         <translation>Probleem</translation>
     </message>
     <message>
         <source>&lt;p&gt;Please create an SMTP account first.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Eerst een SMTP account aanmaken.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a File.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Bestand kiezen aub.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Sending mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Store message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Store message into drafts?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished">Ja</translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished">Nee</translation>
     </message>
     <message>
         <source>&lt;center&gt;Attachments will not be stored in &quot;Draft&quot; folder&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Receiver specified</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposeMailUI</name>
     <message>
         <source>Compose Message</source>
         <translation>Nieuw bericht</translation>
     </message>
     <message>
         <source>send later</source>
         <translation>stuur later</translation>
     </message>
     <message>
         <source>use:</source>
         <translation>gebruik:</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Mail</translation>
     </message>
     <message>
         <source>Subject</source>
         <translation>Onderwerp</translation>
     </message>
     <message>
         <source>From</source>
         <translation>Van</translation>
     </message>
     <message>
         <source>To</source>
         <translation>Naar</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opties</translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation>Antwoord aan</translation>
     </message>
     <message>
         <source>BCC</source>
         <translation>BCC</translation>
     </message>
     <message>
         <source>Signature</source>
         <translation>Handtekening</translation>
     </message>
     <message>
         <source>CC</source>
         <translation>CC</translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation>Bijlage</translation>
     </message>
     <message>
         <source>Delete File</source>
         <translation>Verwijder bestand</translation>
     </message>
     <message>
         <source>Add File</source>
         <translation>Voeg bestand toe</translation>
     </message>
 </context>
 <context>
     <name>EditAccounts</name>
     <message>
         <source>Account</source>
         <translation>Account</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>Question</source>
         <translation>Vraag</translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete the selected Account?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Moet het geselecteerde account echt verwijderd worden?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nee</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select an account.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Selecteer een account.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
 </context>
 <context>
     <name>EditAccountsUI</name>
     <message>
         <source>Configure Accounts</source>
         <translation>Stel accounts in</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Mail</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nieuw</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Accountnaam</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Wijzig</translation>
     </message>
     <message>
         <source>News</source>
         <translation>Nieuws</translation>
     </message>
 </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>
         <source>Name of the Account</source>
         <translation>Accountnaam</translation>
     </message>
     <message>
         <source>Account</source>
         <translation>Account</translation>
     </message>
     <message>
         <source>Prefix</source>
         <translation>Voorvoegsel</translation>
     </message>
     <message>
         <source>ssh $SERVER exec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished">Gebruik veilige sockets:</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Mail</source>
         <translation>Mail</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Instellingen</translation>
     </message>
     <message>
         <source>Compose new mail</source>
         <translation>Nieuwe mail</translation>
     </message>
     <message>
         <source>Send queued mails</source>
         <translation>Verzend mail wachtrij</translation>
     </message>
     <message>
         <source>Show/Hide folders</source>
         <translation>Toon/Verberg mappen</translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation>Verwijder Mail</translation>
     </message>
     <message>
         <source>Edit settings</source>
         <translation>Wijzig instellingen</translation>
     </message>
     <message>
         <source>Configure accounts</source>
         <translation>Stel accounts in</translation>
     </message>
     <message>
         <source>Mailbox</source>
         <translation>Mailbox</translation>
     </message>
     <message>
         <source>Subject</source>
         <translation>Onderwerp</translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Newsgroups</source>
         <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>
     </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>
 <context>
     <name>NNTPconfigUI</name>
     <message>
         <source>Configure NNTP</source>
         <translation>Stel NNTP in</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Poort</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Accountnaam</translation>
     </message>
     <message>
         <source>Account</source>
         <translation>Account</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
         <source>Use SSL</source>
         <translation>Gebruik SSL</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Gebruiker</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Wachtwoord</translation>
     </message>
     <message>
         <source>Use Login</source>
         <translation>Gebruik Login</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Newsgroup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get newsgroup list from server</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Newmdirdlgui</name>
     <message>
         <source>Enter directory name</source>
         <translation>Voer mapnaam in</translation>
     </message>
     <message>
         <source>Directory name:</source>
         <translation>Mapnaam:</translation>
     </message>
     <message>
         <source>Directory contains other subdirs</source>
         <translation>Map bevat submappen</translation>
     </message>
 </context>
 <context>
     <name>OpieMail</name>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
         <source>Mail queue flushed</source>
         <translation>Mail wachtrij gewist</translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation>Verwijder Mail</translation>
     </message>
     <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>Read this mail</source>
         <translation>Lees deze mail</translation>
     </message>
     <message>
         <source>Delete this mail</source>
         <translation>Verwijder deze mail</translation>
     </message>
     <message>
         <source>Copy/Move this mail</source>
         <translation>Kopieer/Verplaats deze mail</translation>
     </message>
     <message>
         <source>Error creating new Folder</source>
         <translation>Fout bij nieuwe map aanmaken</translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation>&lt;center&gt;Fout bij maken van&lt;br&gt;nieuwe map - afgebroken.&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>Stel POP3 in</translation>
     </message>
     <message>
         <source>Account</source>
         <translation>Account</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Accountnaam</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Poort</translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation>Gebruik veilige sockets:</translation>
     </message>
     <message>
         <source>ssh $SERVER exec imapd</source>
         <translation>ssh $SERVER exec imapd</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Gebruiker</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Wachtwoord</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>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>
         <source>Password</source>
         <translation>Wachtwoord</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Poort</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
         <source>Port of the SMTP Server</source>
         <translation>SMTP Servernaam</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Gebruiker</translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished">Gebruik veilige sockets:</translation>
     </message>
     <message>
         <source>ssh $SERVER exec</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SelectMailTypeUI</name>
     <message>
         <source>Select Type</source>
         <translation>Kies type</translation>
     </message>
     <message>
         <source>Select Account Type</source>
         <translation>Kies Accounttype</translation>
     </message>
     <message>
         <source>IMAP</source>
         <translation>IMAP</translation>
     </message>
     <message>
         <source>POP3</source>
         <translation>POP3</translation>
     </message>
     <message>
         <source>SMTP</source>
         <translation>SMTP</translation>
     </message>
 </context>
 <context>
     <name>SettingsDialogUI</name>
     <message>
         <source>Settings Dialog</source>
         <translation>Instellings Dialoog</translation>
     </message>
     <message>
         <source>View Mail</source>
         <translation>Bekijk Mail</translation>
     </message>
     <message>
         <source>View mail as Html</source>
         <translation>Bekijk Mail als HTML</translation>
     </message>
     <message>
         <source>Compose Mail</source>
         <translation>Nieuwe mail</translation>
     </message>
     <message>
         <source>Send mails later ( enqueue in outbox )</source>
         <translation>Verzend later (verzamelen in Uitmap)</translation>
     </message>
     <message>
         <source>Taskbar Applet</source>
         <translation>Taakbalk applet</translation>
     </message>
     <message>
         <source>Disable Taskbar Applet</source>
         <translation>Blokkeer taakbalk applet</translation>
     </message>
     <message>
         <source> min</source>
         <translation>min</translation>
     </message>
     <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>
     <message>
         <source>From</source>
         <translation>Van</translation>
     </message>
     <message>
         <source>To</source>
         <translation>Naar</translation>
     </message>
     <message>
         <source>Cc</source>
         <translation>CC</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot reply yet.</source>
         <translation>&lt;p&gt;De mailtekst is nog niet opgehaald, dus u kunt nog niet antwoorden.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot forward yet.</source>
         <translation>&lt;p&gt;De mailtekst is nog niet opgehaald, dus u kunt nog niet doorsturen.</translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation>Verwijder Mail</translation>
     </message>
     <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>
         <source>Attachments</source>
         <translation>Bijlagen</translation>
     </message>
     <message>
         <source>Show Html</source>
         <translation>Laat HTML zien</translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation>Verwijder Mail</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Omschrijving</translation>
     </message>
     <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>
         <translation>Selecteer doelmap</translation>
     </message>
     <message>
         <source>&lt;b&gt;Store mail(s) to&lt;/b&gt;</source>
         <translation>&lt;b&gt;Mail(s) opslaan naar&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Folder:</source>
         <translation>Map:</translation>
     </message>
     <message>
         <source>Account:</source>
         <translation>Account:</translation>
     </message>
     <message>
         <source>Create new folder</source>
         <translation>Nieuwe map aanmaken</translation>
     </message>
     <message>
         <source>Prefix will prepend, no need to enter it!</source>
         <translation>Voorvoegsel wordt toegevoegd, invoeren niet nodig!</translation>
     </message>
     <message>
         <source>Move mail(s)</source>
         <translation>Verplaats mail(s)</translation>
     </message>
 </context>
 </TS>
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
@@ -1,231 +1,153 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HelpWindow</name>
     <message>
         <source>Backward</source>
         <translation>Vooruit</translation>
     </message>
     <message>
         <source>Forward</source>
         <translation>Achteruit</translation>
     </message>
 </context>
 <context>
     <name>QtRec</name>
     <message>
         <source>OpieRecord </source>
         <translation>OpieOpname</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Naam</translation>
     </message>
     <message>
         <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>
         <source>Volume</source>
         <translation>Volume</translation>
     </message>
     <message>
         <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>
     <message>
         <source>Send with Ir</source>
         <translation>Stuur via IR</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Hernoem</translation>
     </message>
     <message>
         <source>Ir Beam out</source>
         <translation>Beam via IR</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>IR verzonden.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>OK</translation>
     </message>
     <message>
-        <source>Rec</source>
-        <translation 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>
 </TS>
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,171 +1,131 @@
 <!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>
         <source>Options</source>
         <translation>Opties</translation>
     </message>
     <message>
         <source>Enter your search terms here</source>
         <translation>Voer hier de zoektermen in</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Programma&apos;s</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Documenten</translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation>Te-doen lijst</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Kalender</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Kontakten</translation>
     </message>
     <message>
         <source>Search for: </source>
         <translation>Zoek naar:</translation>
     </message>
     <message>
         <source></source>
         <translation></translation>
     </message>
     <message>
         <source>Case sensitive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OListView</name>
     <message>
         <source>Results</source>
         <translation>Resultaten</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>show</source>
         <translation>laat zien</translation>
     </message>
     <message>
         <source>edit</source>
         <translation>verander</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>voer uit</translation>
     </message>
     <message>
         <source>open in filemanager</source>
         <translation>open in bestandsmanager</translation>
     </message>
     <message>
         <source>open with </source>
         <translation>open met</translation>
     </message>
     <message>
-        <source>show completed tasks</source>
-        <translation 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>
         <source>Search in dates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search content</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,475 +1,463 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CalcDlg</name>
     <message>
         <source>Molecular Weight</source>
         <translation>Moleculair gewicht</translation>
     </message>
     <message>
         <source>Chemical Formula</source>
         <translation>Chemishe formule</translation>
     </message>
     <message>
         <source>Calculate</source>
         <translation>Bereken</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>Schoon</translation>
     </message>
     <message>
         <source>Molecular Weight (u):</source>
         <translation>Moleculair gewicht (u):</translation>
     </message>
     <message>
         <source>Elemental Composition (%):</source>
         <translation>Elementaire compositie (%):</translation>
     </message>
     <message>
         <source>CalcDlg</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OxydataWidget</name>
     <message>
         <source>%1 u</source>
         <translation>%1 u</translation>
     </message>
     <message>
         <source>%1 pm</source>
         <translation>%1 pm</translation>
     </message>
     <message>
         <source>%1 J</source>
         <translation>%1 J</translation>
     </message>
     <message>
         <source>%1 g/cm^3</source>
         <translation>%1 g/cm^3</translation>
     </message>
     <message>
         <source>%1 K</source>
         <translation>%1 K</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation>Gewicht</translation>
     </message>
     <message>
         <source>Block</source>
         <translation>Blok</translation>
     </message>
     <message>
         <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>
 <context>
     <name>Oxygen</name>
     <message>
         <source>Oxygen</source>
         <translation>Zuurstof</translation>
     </message>
     <message>
         <source>PSE</source>
         <translation>PSE</translation>
     </message>
     <message>
         <source>Data</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation>Berekeningen</translation>
     </message>
     <message>
         <source>Hydrogen</source>
         <translation>Waterstof</translation>
     </message>
     <message>
         <source>Helium</source>
         <translation>Helium</translation>
     </message>
     <message>
         <source>Lithium</source>
         <translation>Lithium</translation>
     </message>
     <message>
         <source>Beryllium</source>
         <translation>Beryllium</translation>
     </message>
     <message>
         <source>Boron</source>
         <translation>Boor</translation>
     </message>
     <message>
         <source>Carbon</source>
         <translation>Koolstof</translation>
     </message>
     <message>
         <source>Nitrogen</source>
         <translation>Stikstof</translation>
     </message>
     <message>
         <source>Fluorine</source>
         <translation>Fluor</translation>
     </message>
     <message>
         <source>Neon</source>
         <translation>Neon</translation>
     </message>
     <message>
         <source>Sodium</source>
         <translation>Natrium</translation>
     </message>
     <message>
         <source>Magnesium</source>
         <translation>Magnesium</translation>
     </message>
     <message>
         <source>Aluminum</source>
         <translation>Aluminium</translation>
     </message>
     <message>
         <source>Silicon</source>
         <translation>Silicium</translation>
     </message>
     <message>
         <source>Phosphorus</source>
         <translation>Fosfor</translation>
     </message>
     <message>
         <source>Sulfur</source>
         <translation>Zwavel</translation>
     </message>
     <message>
         <source>Chlorine</source>
         <translation>Chloor</translation>
     </message>
     <message>
         <source>Argon</source>
         <translation>Argon</translation>
     </message>
     <message>
         <source>Potassium</source>
         <translation>Kalium</translation>
     </message>
     <message>
         <source>Calcium</source>
         <translation>Calcium</translation>
     </message>
     <message>
         <source>Scandium</source>
         <translation>Scandium</translation>
     </message>
     <message>
         <source>Titanium</source>
         <translation>Titaan</translation>
     </message>
     <message>
         <source>Vanadium</source>
         <translation>Vanadium</translation>
     </message>
     <message>
         <source>Chromium</source>
         <translation>Chroom</translation>
     </message>
     <message>
         <source>Manganese</source>
         <translation>Mangaan</translation>
     </message>
     <message>
         <source>Iron</source>
         <translation>IJzer</translation>
     </message>
     <message>
         <source>Cobalt</source>
         <translation>Kobalt</translation>
     </message>
     <message>
         <source>Nickel</source>
         <translation>Nikkel</translation>
     </message>
     <message>
         <source>Copper</source>
         <translation>Koper</translation>
     </message>
     <message>
         <source>Zinc</source>
         <translation>Zink</translation>
     </message>
     <message>
         <source>Gallium</source>
         <translation>Gallium</translation>
     </message>
     <message>
         <source>Germanium</source>
         <translation>Germanium</translation>
     </message>
     <message>
         <source>Arsenic</source>
         <translation>Arseen</translation>
     </message>
     <message>
         <source>Selenium</source>
         <translation>Seleen</translation>
     </message>
     <message>
         <source>Bromine</source>
         <translation>Broom</translation>
     </message>
     <message>
         <source>Krypton</source>
         <translation>Krypton</translation>
     </message>
     <message>
         <source>Rubidium</source>
         <translation>Rubidium</translation>
     </message>
     <message>
         <source>Strontium</source>
         <translation>Strontium</translation>
     </message>
     <message>
         <source>Yttrium</source>
         <translation>Yttrium</translation>
     </message>
     <message>
         <source>Zirconium</source>
         <translation>Zirconium</translation>
     </message>
     <message>
         <source>Niobium</source>
         <translation>Niobium</translation>
     </message>
     <message>
         <source>Molybdenum</source>
         <translation>Molybdeen</translation>
     </message>
     <message>
         <source>Technetium</source>
         <translation>Technetium</translation>
     </message>
     <message>
         <source>Ruthenium</source>
         <translation>Ruthenium</translation>
     </message>
     <message>
         <source>Rhodium</source>
         <translation>Rodium</translation>
     </message>
     <message>
         <source>Palladium</source>
         <translation>Palladium</translation>
     </message>
     <message>
         <source>Silver</source>
         <translation>Zilver</translation>
     </message>
     <message>
         <source>Cadmium</source>
         <translation>Cadmium</translation>
     </message>
     <message>
         <source>Indium</source>
         <translation>Indium</translation>
     </message>
     <message>
         <source>Tin</source>
         <translation>Tin</translation>
     </message>
     <message>
         <source>Antimony</source>
         <translation>Antimoon</translation>
     </message>
     <message>
         <source>Tellurium</source>
         <translation>Telluur</translation>
     </message>
     <message>
         <source>Iodine</source>
         <translation>Jood</translation>
     </message>
     <message>
         <source>Xenon</source>
         <translation>Xenon</translation>
     </message>
     <message>
         <source>Cesium</source>
         <translation>Cesium</translation>
     </message>
     <message>
         <source>Barium</source>
         <translation>Barium</translation>
     </message>
     <message>
         <source>Lanthanum</source>
         <translation>Lanthaan</translation>
     </message>
     <message>
         <source>Cerium</source>
         <translation>Cerium</translation>
     </message>
     <message>
         <source>Praseodymium</source>
         <translation>Praseodymium</translation>
     </message>
     <message>
         <source>Neodymium</source>
         <translation>Neodymium</translation>
     </message>
     <message>
         <source>Promethium</source>
         <translation>Promethium</translation>
     </message>
     <message>
         <source>Samarium</source>
         <translation>Samarium</translation>
     </message>
     <message>
         <source>Europium</source>
         <translation>Europium</translation>
     </message>
     <message>
         <source>Gadolinium</source>
         <translation>Gadolinium</translation>
     </message>
     <message>
         <source>Terbium</source>
         <translation>Terbium</translation>
     </message>
     <message>
         <source>Dysprosium</source>
         <translation>Dysprosium</translation>
     </message>
     <message>
         <source>Holmium</source>
         <translation>Holmium</translation>
     </message>
     <message>
         <source>Erbium</source>
         <translation>Erbium</translation>
     </message>
     <message>
         <source>Thulium</source>
         <translation>Thulium</translation>
     </message>
     <message>
         <source>Ytterbium</source>
         <translation>Ytterbium</translation>
     </message>
     <message>
         <source>Lutetium</source>
         <translation>Lutetium</translation>
     </message>
     <message>
         <source>Hafnium</source>
         <translation>Hafnium</translation>
     </message>
     <message>
         <source>Tantalum</source>
         <translation>Tantaal</translation>
     </message>
     <message>
         <source>Tungsten</source>
         <translation>Wolfraam</translation>
     </message>
     <message>
         <source>Rhenium</source>
         <translation>Renium</translation>
     </message>
     <message>
         <source>Osmium</source>
         <translation>Osmium</translation>
     </message>
     <message>
         <source>Iridium</source>
         <translation>Iridium</translation>
     </message>
     <message>
         <source>Platinum</source>
         <translation>Platina</translation>
     </message>
     <message>
         <source>Gold</source>
         <translation>Goud</translation>
     </message>
     <message>
         <source>Mercury</source>
         <translation>Merkuur</translation>
     </message>
     <message>
         <source>Thallium</source>
         <translation>Thallium</translation>
     </message>
     <message>
         <source>Lead</source>
         <translation>Lood</translation>
     </message>
     <message>
         <source>Bismuth</source>
         <translation>Bismut</translation>
     </message>
     <message>
         <source>Polonium</source>
         <translation>Polonium</translation>
     </message>
     <message>
         <source>Astatine</source>
         <translation>Astaat</translation>
     </message>
     <message>
         <source>Radon</source>
         <translation>Radon</translation>
     </message>
     <message>
         <source>Francium</source>
         <translation>Francium</translation>
     </message>
     <message>
         <source>Radium</source>
         <translation>Radium</translation>
     </message>
     <message>
         <source>Actinium</source>
         <translation>Actinium</translation>
     </message>
     <message>
         <source>Thorium</source>
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
@@ -1,97 +1,73 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CanvasCardWindow</name>
     <message>
         <source>Patience</source>
         <translation>Patience</translation>
     </message>
     <message>
         <source>Freecell</source>
         <translation>Freecell</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>
         <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>
         <source>Snap to position</source>
         <translation>Spring naar plaats</translation>
     </message>
     <message>
         <source>Turn one card</source>
         <translation>Draai een kaart</translation>
     </message>
     <message>
         <source>Turn three cards</source>
         <translation>Draai drie kaarten</translation>
     </message>
 </context>
 </TS>
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
@@ -1,601 +1,418 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation>Taal</translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation>Tijd en Datum</translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation>Persoonlijke Informatie</translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation>DocTab</translation>
     </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation>Programma probleem</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation>&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>&lt;p&gt;Wilt u het programma geforceerd verlaten?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;p&gt;Snelladen is uitgeschakeld vorr dit programma. Druk lang op programma-icoon om weer in te schakelen&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was gestopt door signaal code %2&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation>Programma gestopt</translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation>Programma niet gevonden</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Kon programma &lt;b&gt;%1&lt;/b&gt; niet vinden.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Error</source>
         <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>
 <context>
     <name>FirstUse</name>
     <message>
         <source>&lt;&lt; Back</source>
         <translation>&lt;&lt; Terug</translation>
     </message>
     <message>
         <source>Next &gt;&gt;</source>
         <translation>Volgende &gt;&gt;</translation>
     </message>
     <message>
         <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>
         <source>Documents</source>
         <translation>Documenten</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>View as text</source>
         <translation>Bekijk als tekst</translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>Icon View</source>
         <translation>Icoonaanzicht</translation>
     </message>
     <message>
         <source>List View</source>
         <translation>Lijstaanzicht</translation>
     </message>
     <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>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Plaatjes</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Tekst</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation>Beperk zoeken tot:</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Voeg toe</translation>
     </message>
     <message>
         <source>Remove</source>
         <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>
     <message>
         <source>Plugin Manager...</source>
         <translation>Plugin Manager...</translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation>Herstart Opie</translation>
     </message>
     <message>
         <source>Help...</source>
         <translation>Hulp...</translation>
     </message>
 </context>
 <context>
     <name>Server</name>
     <message>
         <source>USB Lock</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <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>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation>Plugin Manager...</translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation>Geheugen Status</translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation>Geheugen bijna vol
 Data opslaan aub.</translation>
     </message>
     <message>
         <source>Critical Memory Shortage
 Please end this application
 immediately.</source>
         <translation>Kritiek geheugengebrek
 Dit programma aub
 direct afsluiten.</translation>
     </message>
     <message>
         <source>WARNING</source>
         <translation>WAARSCHUWING</translation>
     </message>
     <message>
         <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
         <translation>&lt;p&gt;De batterijlading is kritiek laag!&lt;p&gt;Schakel uit tot stroom weer wordt aangesloten</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>The battery is running very low. </source>
         <translation>De batterijlading is erg laag.</translation>
     </message>
     <message>
         <source>&lt;p&gt;The Back-up battery is very low&lt;p&gt;Please charge the back-up battery</source>
         <translation>&lt;p&gt;De backup-batterij lading is kritiek laag!&lt;p&gt;Aub backup-batterij opladen</translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Shutdown...</source>
         <translation>Afsluiten...</translation>
     </message>
     <message>
         <source>Terminate</source>
         <translation>Beeindigen</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation>Opie beeindigen</translation>
     </message>
     <message>
         <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
@@ -1,551 +1,257 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoginBase</name>
     <message>
         <source>LoginBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login</source>
         <translation type="unfinished">Log in</translation>
     </message>
     <message>
         <source>Login Automatically</source>
         <translation type="unfinished">Log automatich in</translation>
     </message>
     <message>
         <source>If you select this option, opie-login will automagically log you in with the user you have selected in the drop-down list.  
 
 For the Zaurus 5x00 this is always the user &quot;root&quot;.</source>
         <translation type="unfinished">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="unfinished">Op deze lijst  kunt u de gebruiker voor auto-login selecteren
 (als deze optie aanstaat)
 
 Alleen een geconfigureerd gebruiker kan geselecteerd worden.</translation>
     </message>
 </context>
 <context>
     <name>MultiauthConfig</name>
     <message>
         <source>Security configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the order they will appear in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
         <source>Locking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></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-securityplugin-*&lt;/em&gt; package! Once you have done that, you will be able to configure your PDA protection here.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MultiauthGeneralConfig</name>
     <message>
         <source>When to lock Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on Opie start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on Opie resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Multiple plugins authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Required successes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Don&apos;t protect this config screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show explanatory screens</source>
         <translation type="unfinished"></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>
         <source>Attention</source>
         <translation type="unfinished">Attentie</translation>
     </message>
     <message>
         <source>You must save your current settings before trying to authenticate. Press OK to accept and launch a simulated authentication process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you don&apos;t like the result of this test, don&apos;t forget to change your settings before you exit the configuration application!</source>
         <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>
     </message>
     <message>
         <source>Select a net-range or enter a new one.  
 
 This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
 
 For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
 
 The entry &quot;All&quot; will allow *any* IP to connect. 
 The entry &quot;None&quot; will *deny* any connection.  
 
 If unsure, select &quot;Any&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Entry</source>
         <translation type="unfinished">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="unfinished">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="unfinished">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="unfinished">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="unfinished">Kies de synchronisatiesoftware</translation>
     </message>
     <message>
         <source>Qtopia 1.7</source>
         <translation type="unfinished">Qtopia 1.7</translation>
     </message>
     <message>
         <source>Opie 1.0</source>
         <translation type="unfinished">Opie 1.0</translation>
     </message>
     <message>
         <source>IntelliSync</source>
         <translation type="unfinished">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 type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,51 +1,43 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>SnakeGame</name>
     <message>
         <source>Snake</source>
         <translation>Snake</translation>
     </message>
     <message>
         <source>New Game</source>
         <translation>Nieuw Spel</translation>
     </message>
     <message>
         <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
@@ -1,417 +1,365 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation>Dit vlak toont de beschikbare tests, de resultaten van de uitgevoerde tests, en vergelikingswaarden voor een geslecteerd apparaat. Gebruik de keuzevlakken om de gewenste tests uit te kiezen.</translation>
     </message>
     <message>
         <source>Tests</source>
         <translation>Tests</translation>
     </message>
     <message>
         <source>Results</source>
         <translation>Resultaat</translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation>Vergelijking</translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation>1. Integer rekenen</translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation>2. Breukrekenen</translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation>3. Tekstrendering</translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation>4. Beeldrendering</translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation>5. RAM Prestaties</translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation>6. SD Kaart Prestaties</translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation>6. CF Kaart Prestaties</translation>
     </message>
     <message>
         <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>
         <translation>Deze grafiek geeft weer hoeveel ruimte gebruikt wordt op deze Compact Flash kaart.</translation>
     </message>
     <message>
         <source>Ha</source>
         <translation>Ha</translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation>Deze grafiek geeft weer hoeveel ruimte gebruikt wordt op deze Harde schijf.</translation>
     </message>
     <message>
         <source>SD</source>
         <translation>SD</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation>Deze grafiek geeft weer hoeveel ruimte gebruikt wordt op deze Secure Digital kaart.</translation>
     </message>
     <message>
         <source>SC</source>
         <translation>SC</translation>
     </message>
     <message>
         <source>In</source>
         <translation>In</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation>Deze grafiek geeft weer hoeveel ruimte van het interne Flash geheugen van dit apparaat gebruikt wordt.</translation>
     </message>
     <message>
         <source>RA</source>
         <translation>RA</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation>Deze grafiek geeft weer hoeveel ruimte gebruikt wordt op de tijdelijke RAM schijf van dit apparaat.</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Programma GPU gebruik (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>Systeem CPU gebruik (%)</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Deze pagina laat zien hoeveel van de processor van dit apparaat gebruikt wordt.</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Type:</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
-        <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
-Memory is categorized as follows:
-
-1. Used - memory used to by Opie and any running applications.
-2. Buffers - temporary storage used to improve performance
-3. Cached - information that has recently been used, but has not been freed yet.
-4. Free - memory not currently used by Opie or any running applications.</source>
-        <translation type="obsolete">Deze pagina geeft weer hoeveel geheugen (dwz RAM) in gebruik is op uw hanheld.
-Gehugen wordt als volgt onderverdeeld:
-
-1. Gebruikt - Geheugen dat in gebruik is door Opie en lopende programma&apos;s.
-2. Buffers - Tijdelijke opslag tbv verbetering snelheid.
-3. Cache - Recent gebruikte informatie, die nog niet vrijgegeven is.
-4. Vrij - Geheugen dat momenteel niet in gebruik is door Opie of lopende programma&apos;s.</translation>
-    </message>
-    <message>
         <source>Used (%1 kB)</source>
         <translation>Gebruikt (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Buffers (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Cache (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Vrij (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Totaal geheugen: %1 kB</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation>Deze pagina geeft weer hoeveel geheugen (dwz RAM) in gebruik is op uw handheld.
 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>Total Swap: %1 kB</source>
         <translation>Tataal Swap: %1 kB</translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Module</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Grootte</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Gebruik#</translation>
     </message>
     <message>
-        <source>Used By</source>
-        <translation type="obsolete">Gebruikt door</translation>
-    </message>
-    <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>Dit is een lijst van alle kernelmodules die momenteel geladen zijn op deze handheld.
 
 Druk een tijd op een module om meer informatie over de module te zien, of hem te beeindigen.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Selecteer hier een commando en klik op de Zend knop (rechts in beeld) om het commando naar de module te sturen.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Zend</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Klik hier om het commando naar de module te sturen.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Dit vlak geeft gedetailleerde informatie over deze module weer.</translation>
     </message>
     <message>
-        <source>You really want to execute
-</source>
-        <translation type="obsolete">Wilt u dit echt uitvoeren
-</translation>
-    </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>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Gebruikt (%1 kB)</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>Beschikbaar (%1 kB)</translation>
     </message>
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Commando</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Tijd</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation>Dit is een lijst van alle processen die momenteel geladen zijn op deze handheld.
 
 Druk een tijd op een module om meer informatie over de module te zien, of een signaal te sturen.</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation>Selecteer hier een signaal en klik op de Zend knop (rechts in beeld) om hetnaar dit proces te sturen.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Zend</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation>Klik hier om het signaal naar dit proces te sturen.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>Dit vlak laat gedetailleerde info over dit proces zien.</translation>
     </message>
     <message>
-        <source>You really want to send
-</source>
-        <translation type="obsolete">Wilt u dit echt zenden
-</translation>
-    </message>
-    <message>
-        <source>You really want to send %1 to this process?</source>
-        <translation 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>
     <message>
         <source>Memory</source>
         <translation>Geheugen</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Opslag</translation>
     </message>
     <message>
         <source>CPU</source>
         <translation>CPU</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Proces</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>Modules</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Versie</translation>
     </message>
     <message>
         <source>Benchmark</source>
         <translation>Benchmark</translation>
     </message>
     <message>
         <source>Syslog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Versie: </translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Gecompileerd door:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Versie: </translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Gebouwd op:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>&lt;p&gt;Versie:</translation>
     </message>
     <message>
-        <source>&lt;p&gt;Model: </source>
-        <translation 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>
         <source>Built against Qt/E </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,264 +1,248 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FormatTabWidget</name>
     <message>
         <source>Time format</source>
         <translation>Tijdsformaat</translation>
     </message>
     <message>
         <source>hh:mm</source>
         <translation>uu:mm</translation>
     </message>
     <message>
         <source>D/M hh:mm</source>
         <translation>D/M uu:mm</translation>
     </message>
     <message>
         <source>M/D hh:mm</source>
         <translation>M/D uu:mm</translation>
     </message>
     <message>
         <source>12/24 hour</source>
         <translation>12/24 uur</translation>
     </message>
     <message>
         <source>24 hour</source>
         <translation>24 uur</translation>
     </message>
     <message>
         <source>12 hour</source>
         <translation>12 uur</translation>
     </message>
     <message>
         <source>Date format</source>
         <translation>Datumformaat</translation>
     </message>
     <message>
         <source>Weeks start on</source>
         <translation>Week start op</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Zondag</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Maandag</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>SystemTime</source>
         <translation>Systeemtijd</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Tijd</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <source>Error while getting time from network.</source>
         <translation>Fout tijdens ophalen tijd van netwerk.</translation>
     </message>
     <message>
         <source>Error while executing ntpdate</source>
         <translation>Fout tijdens uitvoer van 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>
         <source>Retrieving time from network...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NTPTabWidget</name>
     <message>
         <source>Start time</source>
         <translation>Starttijd</translation>
     </message>
     <message>
         <source>n/a</source>
         <translation>n/b</translation>
     </message>
     <message>
         <source>Time shift</source>
         <translation>Tijdsverschil</translation>
     </message>
     <message>
         <source>New time</source>
         <translation>Nieuwe tijd</translation>
     </message>
     <message>
         <source>Get time from the network</source>
         <translation>Haal tijd van het netwerk</translation>
     </message>
 </context>
 <context>
     <name>PredictTabWidget</name>
     <message>
         <source>Predicted time drift</source>
         <translation>Voorspelde tijdsverschuiving</translation>
     </message>
     <message>
         <source>n/a</source>
         <translation>n/b</translation>
     </message>
     <message>
         <source>Estimated shift</source>
         <translation>Geachatte verschuiving</translation>
     </message>
     <message>
         <source>Predicted time</source>
         <translation>Voorspelde tijd</translation>
     </message>
     <message>
         <source>Shift [s/h]</source>
         <translation>Verschuiving [s/u]</translation>
     </message>
     <message>
         <source>Last [h]</source>
         <translation>Laatste [u]</translation>
     </message>
     <message>
         <source>Offset [s]</source>
         <translation>Offset [s]</translation>
     </message>
     <message>
         <source>Predict time</source>
         <translation>Voorspelde tijd</translation>
     </message>
     <message>
         <source>Set predicted time</source>
         <translation>Stel voorspelde tijd in</translation>
     </message>
     <message>
         <source> s/h</source>
         <translation>s/u</translation>
     </message>
     <message>
         <source> seconds</source>
         <translation>seconden</translation>
     </message>
 </context>
 <context>
     <name>SettingsTabWidget</name>
     <message>
         <source>Time server</source>
         <translation>Tijsserver</translation>
     </message>
     <message>
         <source>minutes between time updates</source>
         <translation>minuten tussen tijdverversing</translation>
     </message>
     <message>
         <source>minutes between prediction updates</source>
         <translation>minuten tussen voorspellingsverversing</translation>
     </message>
     <message>
         <source>Display time server information</source>
         <translation>Geef tijdsserver informatie weer</translation>
     </message>
     <message>
         <source>Display time prediction information</source>
         <translation>Geef tijdsvoorspellingsinformatie weer</translation>
     </message>
 </context>
 <context>
     <name>TimeTabWidget</name>
     <message>
         <source>Hour</source>
         <translation>Uur</translation>
     </message>
     <message>
         <source>Minute</source>
         <translation>Minuut</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Tijdszone</translation>
     </message>
     <message>
         <source>Get time from the network</source>
         <translation>Haal tijd van het netwerk</translation>
     </message>
     <message>
         <source>Set predicted time</source>
         <translation>Stel voorspelde tijd in</translation>
     </message>
 </context>
 </TS>
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,69 +1,58 @@
 <!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>
     <message>
         <source>TableViewer - Edit Keys</source>
         <translation>TabelViewer - Wijzig sleutels</translation>
     </message>
     <message>
         <source>Key Name</source>
         <translation>Sleutelnaam</translation>
     </message>
     <message>
         <source>Key Type</source>
         <translation>Sleuteltype</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nieuw</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <source>Clear All</source>
         <translation>Schoon alles</translation>
     </message>
 </context>
 <context>
     <name>TVListView</name>
     <message>
         <source>List View</source>
         <translation>Lijstaanzicht</translation>
     </message>
 </context>
 <context>
     <name>TableViewerWindow</name>
     <message>
         <source>Table Viewer</source>
         <translation>TabelViewer</translation>
     </message>
     <message>
         <source>could not load Document</source>
         <translation>kan document niet laden</translation>
     </message>
 </context>
 </TS>
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
@@ -1,284 +1,278 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>TextEdit</name>
     <message>
         <source>New</source>
         <translation>Nieuw</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Open</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Opslaan</translation>
     </message>
     <message>
         <source>Save As</source>
         <translation>Opslaan als</translation>
     </message>
     <message>
         <source>Cut</source>
         <translation>Knip</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Kopieer</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Plak</translation>
     </message>
     <message>
         <source>Insert Time and Date</source>
         <translation>Voeg datum en tijd in</translation>
     </message>
     <message>
         <source>Goto Line...</source>
         <translation>Ga naar regel...</translation>
     </message>
     <message>
         <source>Find...</source>
         <translation>Vind...</translation>
     </message>
     <message>
         <source>Zoom in</source>
         <translation>Zoom in</translation>
     </message>
     <message>
         <source>Zoom out</source>
         <translation>Zoom uit</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Lettertype</translation>
     </message>
     <message>
         <source>Advanced Features</source>
         <translation>Geavanceerde mogelijkheden</translation>
     </message>
     <message>
         <source>Wrap lines</source>
         <translation>Regelafbreking</translation>
     </message>
     <message>
         <source>Start with new file</source>
         <translation>Begin met nieuw bestand</translation>
     </message>
     <message>
         <source>Prompt on Exit</source>
         <translation>Vraag bij weggaan</translation>
     </message>
     <message>
         <source>Always open linked file</source>
         <translation>Altijd gekoppeld bestand openen</translation>
     </message>
     <message>
         <source>File Permissions</source>
         <translation>Bestandsrechten</translation>
     </message>
     <message>
         <source>Search Bar Open</source>
         <translation>Zoekregel openen</translation>
     </message>
     <message>
         <source>Auto Save 5 min.</source>
         <translation>Automatisch opslaan 5 min.</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Bestand</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Wijzig</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Bekijk</translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation>Vind volgende</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Sluit Vind</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Tekst</translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation>Teksteditor</translation>
     </message>
     <message>
         <source>Text Editor has detected&lt;BR&gt;you selected a &lt;B&gt;.desktop&lt;/B&gt;file.&lt;BR&gt;Open&lt;B&gt;.desktop&lt;/B&gt; file or &lt;B&gt;linked&lt;/B&gt; file?</source>
         <translation>Teksteditor ontdekte dat&lt;br&gt; u een &lt;b&gt;.desktop&lt;/b&gt; selecteert.&lt;br&gt;Zal ik het &lt;b&gt;.desktop&lt;/b&gt; of &lt;b&gt;gekoppeld&lt;/b&gt; bestand openen? </translation>
     </message>
     <message>
         <source>.desktop File</source>
         <translation>.desktop Bestand</translation>
     </message>
     <message>
         <source>Linked Document</source>
         <translation>Gekoppeld document</translation>
     </message>
     <message>
         <source>Text Edit</source>
         <translation>Tekst wijzigen</translation>
     </message>
     <message>
         <source>Write Failed</source>
         <translation>Schrijven mislukt</translation>
     </message>
     <message>
         <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>
         <source>Textedit</source>
         <translation>Tekst wijzigen</translation>
     </message>
     <message>
         <source>Textedit detected
 you have unsaved changes
 Go ahead and save?
 </source>
         <translation>Teksteditor ontdekte
 dat het bestand niet opgeslagen
 wijzigingen bevat.
 Doorgaan met opslaan?
 </translation>
     </message>
     <message>
         <source>Don&apos;t Save</source>
         <translation>Sla niet op</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Annuleer</translation>
     </message>
     <message>
         <source>Not enough lines</source>
         <translation>Niet genoeg regels</translation>
     </message>
     <message>
         <source>%1 - Text Editor</source>
         <translation>%1 - Tekstverwerker</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>Moet dit bestand echt&lt;br&gt;
 van de schijf&lt;b&gt;verwijderd&lt;/b&gt;
 worden? Dit is onomkeerbaar!</translation>
     </message>
     <message>
         <source>Save Failed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>File Permissions</source>
         <translation>Bestandsrechten</translation>
     </message>
     <message>
         <source>Set File Permissions</source>
         <translation>Stel bestandsrechten in</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Stel bestandsrechten in voor:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>eigenaar</translation>
     </message>
     <message>
         <source>group</source>
         <translation>groep</translation>
     </message>
     <message>
         <source>others</source>
         <translation>anderen</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Eigenaar</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Groep</translation>
     </message>
     <message>
         <source>read</source>
         <translation>lees</translation>
     </message>
     <message>
         <source>write</source>
         <translation>schrijf</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>uitvoeren</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Waarschuwing</translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation>Fout- geen gebruiker</translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation>Fout- geen groep</translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation>Fout bij instellen eigenaar of groep</translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation>Fout bij instellen modus</translation>
     </message>
 </context>
 </TS>
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,48 +1,41 @@
 <!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>
     </message>
     <message>
         <source>Quit</source>
         <translation>Stop</translation>
     </message>
     <message>
         <source>Click Play to start</source>
         <translation>Klik Spelen! om te starten</translation>
     </message>
     <message>
         <source>Make your move</source>
         <translation>Doe een zet</translation>
     </message>
     <message>
         <source>You won!</source>
         <translation>Jij wint!</translation>
     </message>
     <message>
         <source>Computer won!</source>
         <translation>Computer wint!</translation>
     </message>
     <message>
         <source>It&apos;s a draw</source>
         <translation>Gelijkspel</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/today.ts b/i18n/nl/today.ts
index 15d8850..346f6d9 100644
--- a/i18n/nl/today.ts
+++ b/i18n/nl/today.ts
@@ -1,198 +1,142 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation type="unfinished">Vandaag</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation>Bezit van</translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Visitekaartje invullen a.u.b.</translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation>Klik hier om het bijbehorende programma te starten</translation>
     </message>
     <message>
-        <source>No plugins found</source>
-        <translation 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>
         <translation>Vandaag</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
         <translation>Vandaag door Maximilian Reiß</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>Klik hier voor het instellingsvenster</translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Today Config</source>
         <translation>Vandaag instelling</translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>Laad plugins in welke volgorde:</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>Vink een checkbox aan om een plugin te activeren/deactiveren of gebruik de pijltjes om de volgorde te veranderen</translation>
     </message>
     <message>
         <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>
         <translation>vink dit aan als Vandaag moet starten vanuit slaapstand.</translation>
     </message>
     <message>
         <source>autostart on resume?</source>
         <translation>start na slaapstand?</translation>
     </message>
     <message>
         <source>tiny banner</source>
         <translation>mini banner</translation>
     </message>
     <message>
         <source>Have small banner </source>
         <translation>Gebruik kleine banner</translation>
     </message>
     <message>
         <source> min</source>
         <translation>min</translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
         <translation>Hoeveel minuten moet de PDA uitstaan voor Vandaag automatisch opkomt bij herstart</translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation>minuten inactief</translation>
     </message>
     <message>
         <source> pixel</source>
         <translation>pixels</translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
         <translation>Stel icoongrootte in pixels in</translation>
     </message>
     <message>
         <source>icon size</source>
         <translation>icoongrootte</translation>
     </message>
     <message>
         <source> sec</source>
         <translation>secsec</translation>
     </message>
     <message>
         <source>never</source>
         <translation>nooit</translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
         <translation>Hoevaak moet Vandaag zich verversen</translation>
     </message>
     <message>
         <source>refresh</source>
         <translation>ververs</translation>
     </message>
 </context>
 </TS>
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,663 +1,567 @@
 <!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>
 <context>
     <name>NewTaskDlg</name>
     <message>
         <source>New Task</source>
         <translation type="unfinished">Nieuwe taak</translation>
     </message>
     <message>
         <source>Blank task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Using template:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Information</source>
         <translation>Informatie</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
         <source>Alarms</source>
         <translation>Alarms</translation>
     </message>
     <message>
         <source>Recurrence</source>
         <translation>Terugkeringen</translation>
     </message>
     <message>
         <source>Task Editor</source>
         <translation>Taakeditor</translation>
     </message>
 </context>
 <context>
     <name>Opie</name>
     <message>
         <source>Todo List</source>
         <translation type="unfinished">Te Doen Lijst</translation>
     </message>
     <message>
         <source>Task</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
         <translation>Voer taak in</translation>
     </message>
     <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>
         <source>Remove</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Naam</translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation>Nieuw voorbeeld %1</translation>
     </message>
     <message>
         <source>Click here to set the priority of new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Voer de prioriteit van de nieuwe taak hier in.
 
 Dit vlak wordt de sneltaakbalk genoemd.
 
 Deze staat u toe om snel een nieuwe taak aan de lijst toe te voegen. Dit vlak kan worden verborgen of getoond door Opties-&gt;&apos;Laat Sneltaakbalk zien&apos; te kiezen in het bovenstaande menu.</translation>
     </message>
     <message>
         <source>Enter description of new task here.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Voer de omschrijving van de nieuwe taak hier in.
 
 Dit vlak wordt de sneltaakbalk genoemd.
 
 Deze staat u toe om snel een nieuwe taak aan de lijst toe te voegen. Dit vlak kan worden verborgen of getoond door Opties-&gt;&apos;Laat Sneltaakbalk zien&apos; te kiezen in het bovenstaande menu.</translation>
     </message>
     <message>
         <source>More</source>
         <translation>Meer</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>Voer de extra info van de nieuwe taak hier in.
 
 Dit vlak wordt de sneltaakbalk genoemd.
 
 Deze staat u toe om snel een nieuwe taak aan de lijst toe te voegen. Dit vlak kan worden verborgen of getoond door Opties-&gt;&apos;Laat Sneltaakbalk zien&apos; te kiezen in het bovenstaande menu.</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Voer in</translation>
     </message>
     <message>
         <source>Click here to add new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Klik hier om een nieuwe taak toe te voegen.
 
 Dit vlak wordt de sneltaakbalk genoemd.
 
 Deze staat u toe om snel een nieuwe taak aan de lijst toe te voegen. Dit vlak kan worden verborgen of getoond door Opties-&gt;&apos;Laat Sneltaakbalk zien&apos; te kiezen in het bovenstaande menu.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Annuleer</translation>
     </message>
     <message>
         <source>Click here to reset new task information.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Klik hier om nieuwe taakinfo te schonen.
 
 Dit vlak wordt de sneltaakbalk genoemd.
 
 Deze staat u toe om snel een nieuwe taak aan de lijst toe te voegen. Dit vlak kan worden verborgen of getoond door Opties-&gt;&apos;Laat Sneltaakbalk zien&apos; te kiezen in het bovenstaande menu.</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Prioriteit:</translation>
     </message>
     <message>
         <source>Data can not be edited, currently syncing</source>
         <translation>Kan data niet wijzigen tijdens synchronisatie</translation>
     </message>
     <message>
         <source>Data can&apos;t be edited, currently syncing</source>
         <translation>Kan data niet wijzigen tijdens synchronisatie</translation>
     </message>
     <message>
         <source>Summary</source>
         <translation>Overzicht</translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>Table View</source>
         <translation>Tabelaanzicht</translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation>%1 Dag(en)</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Geen</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Tijd</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Soort</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nieuw</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Wijzig</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Verwijder</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Description:</source>
         <translation>Omschrijving:</translation>
     </message>
     <message>
         <source>Enter brief description of the task here.</source>
         <translation>Voer hier een korte omschrijving van de taak in.</translation>
     </message>
     <message>
         <source>Complete </source>
         <translation>Gedaan</translation>
     </message>
     <message>
         <source>Work on </source>
         <translation>Werk aan</translation>
     </message>
     <message>
         <source>Buy </source>
         <translation>Koop</translation>
     </message>
     <message>
         <source>Organize </source>
         <translation>Organiseer</translation>
     </message>
     <message>
         <source>Get </source>
         <translation>Haal</translation>
     </message>
     <message>
         <source>Update </source>
         <translation>Updaten</translation>
     </message>
     <message>
         <source>Create </source>
         <translation>Maak</translation>
     </message>
     <message>
         <source>Plan </source>
         <translation>Plannen</translation>
     </message>
     <message>
         <source>Call </source>
         <translation>Bellen</translation>
     </message>
     <message>
         <source>Mail </source>
         <translation>Schrijven</translation>
     </message>
     <message>
         <source>Select priority of task here.</source>
         <translation>Stel prioriteit hier in.</translation>
     </message>
     <message>
         <source>Very High</source>
         <translation>Heel hoog</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Hoog</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normaal</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Laag</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>Heel laag</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorie:</translation>
     </message>
     <message>
         <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>
 <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>Klik hier om de huidige status van deze taak in te stellen.</translation>
     </message>
     <message>
         <source>Started</source>
         <translation>Gestart</translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation>Uitgesteld</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>Gedaan</translation>
     </message>
     <message>
         <source>Not started</source>
         <translation>Niet gestart</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Voortgang:</translation>
     </message>
     <message>
         <source>Select progress made on this task here.</source>
         <translation>Selecteer hier de gemaakte voortgang.</translation>
     </message>
     <message>
         <source>0 %</source>
         <translation>0%</translation>
     </message>
     <message>
         <source>20 %</source>
         <translation>20%</translation>
     </message>
     <message>
         <source>40 %</source>
         <translation>40%</translation>
     </message>
     <message>
         <source>60 %</source>
         <translation>6-%</translation>
     </message>
     <message>
         <source>80 %</source>
         <translation>80%</translation>
     </message>
     <message>
         <source>100 %</source>
         <translation>100%</translation>
     </message>
     <message>
         <source>Start Date:</source>
         <translation>Aanvangsdatum:</translation>
     </message>
     <message>
         <source>Click here to set the date this task was started.</source>
         <translation>Klik hier om de startdatum van de taak in te stellen.</translation>
     </message>
     <message>
         <source>Due Date:</source>
         <translation>Einddatum:</translation>
     </message>
     <message>
         <source>Click here to set the date this task needs to be completed by.</source>
         <translation>Klik hier om een eindtijd voor deze taak in te stellen.
 </translation>
     </message>
     <message>
         <source>Completed:</source>
         <translation>Afgemaakt:</translation>
     </message>
     <message>
         <source>Click here to mark this task as completed.</source>
         <translation>Klik hier om  deze taak als gedaan te markeren.</translation>
     </message>
     <message>
         <source>Click here to set the date this task was completed.</source>
         <translation>Klik hier om de tijd van ahandeling in te stellen.</translation>
     </message>
     <message>
         <source>Maintainer Mode:</source>
         <translation>Beheermodus:</translation>
     </message>
     <message>
         <source>Click here to set the maintainer&apos;s role.</source>
         <translation>Klik hier om de rol van de beheerder in te stellen.</translation>
     </message>
     <message>
         <source>Nothing</source>
         <translation>Niets</translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation>Verantwoordelijk</translation>
     </message>
     <message>
         <source>Done By</source>
         <translation>Gedaan door</translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation>Coordinatie</translation>
     </message>
     <message>
         <source>Maintainer:</source>
         <translation>Beheerder:</translation>
     </message>
     <message>
         <source>This is the name of the current task maintainer.</source>
         <translation>Dit is de naam van de huidige beheerder van deze taak.</translation>
     </message>
     <message>
         <source>test</source>
         <translation>test</translation>
     </message>
     <message>
         <source>Click here to select the task maintainer.</source>
         <translation>Klik hier om de taakbeheerder te selecteren.</translation>
     </message>
 </context>
 </TS>
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
@@ -1,35 +1,31 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GroupDialog</name>
     <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>
         <translation>Gebruiker wijzigen</translation>
     </message>
 </context>
 </TS>
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,878 +1,580 @@
 <!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>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Veld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Veld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Veld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Veld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Veld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Informatie:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Nieuw Record</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Commentaar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Veld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Veld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Wachtwoord</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Gebruikersnaam</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Naam</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Wachtwoord</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Bestandsdialoog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Bestandstype Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation>Combibox Bestandtype Filter
 
 wijzig of selecteer het filter</translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation>bevestigt de selectie en sluit het formulier</translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation>Annuleert de huidige selectie en sluit het formulier</translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation>Annuleer</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation>laat de geselecteerde bestandsnaam zien</translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation>Wijzig Bestandsnaam
 
 Laat het geselecteerde
 bestand zien, en laat
 de bestandsnaam wijzigen</translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation>Combibox Map
 
 wijzig of selecteer de mapnaam</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Naam</translation>
     </message>
     <message>
         <source>size</source>
         <translation>grootte</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Bestandslijstweergave</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation>Lijstaanzicht mappen
 
 laat de lijst van mappen en bestanden zien</translation>
     </message>
     <message>
         <source></source>
         <translation></translation>
     </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation>Map</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Bestand</translation>
     </message>
     <message>
         <source>link</source>
         <translation>koppeling</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Zoek</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Gebruikersnaam</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Commentaar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Naam</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <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>
         <source>&amp;Import text file</source>
         <translation>&amp;Importeer tekstbestand</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
         <translation>Verwijde&amp;r tekstbestand</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
         <translation>&amp;Geexpandeerd openen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
         <translation>&amp;Afsluiten</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Bestand</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Nieuw</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Wijzigen</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Verwijderen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Categorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Knip</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieer</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Plak</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Zoek</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Record</translation>
     </message>
     <message>
         <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>
         <source>Comment</source>
         <translation>Commentaar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Veld 4</translation>
     </message>
     <message>
         <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>
         <translation>Gegeven niet gevonden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
         <translation>Kan tekstbestand niet verwijderen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
         <translation>Kan tekstbestand niet exporteren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
         <translation>Kan tekstbestand niet importeren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
         <translation>Wachtwoord invoeren</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
         <translation>Foutief wachtwoord.
 
 ZSafe zal nu afsluiten.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
         <translation>Foutief wachtwoord.
 
 Nogmaals invoeren?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
         <translation>&amp;Nee</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
         <translation>Leeg bestand of
 foutief wachtwoord.
 Doorgaan?</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;Nee</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
         <translation>&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
         <translation>Leeg wachtwoord.
 Nogmaals invoeren.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
         <translation>Wachtwoord nogmaals invoeren</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
         <translation>Wachtwoorden moeten identiek zijn.
 Nogmaals invoeren.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
         <translation>Wachtwoordbestand opgeslagen.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
         <translation>Wilt u de data opslaan
 voor het afsluiten?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation>&amp;Opslaan</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
         <translation>Met nieuw 
 &amp;Wachtwoord
 opslaan</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
         <translation>&amp;Niet opslaan</translation>
     </message>
     <message>
         <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>
         <source>Find entry</source>
         <translation>Vind Record</translation>
     </message>
     <message>
         <source></source>
         <translation></translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alles</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Tekst</translation>
     </message>
     <message>
         <source>Remove text file</source>
         <translation>Verwijder tekstbestand</translation>
     </message>
     <message>
         <source>No document defined.
 You have to create a new document</source>
         <translation>Geen document gekozen.
 Er moet een nieuw document aangemaakt worden</translation>
     </message>
     <message>
         <source>Export text file</source>
         <translation>Exporteer tekstbestand</translation>
     </message>
     <message>
         <source>Import text file</source>
         <translation>Importeer tekstbestand</translation>
     </message>
     <message>
         <source>Do you want to save </source>
         <translation>Wilt u opslaan</translation>
     </message>
     <message>
         <source>
 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>
         <source>&lt;P&gt;You must create a new document first. Ok to create?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Password Manager&lt;br&gt;ZSafe version 2.1.2&lt;br&gt;&lt;/b&gt;by Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Translations by Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,419 +1,358 @@
 <!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>
         <source>Open as text</source>
         <translation>Åpne som tekst</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Handlinger</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>Lag katalog</translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation>Lag symlenke</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Endre navn</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Kopier</translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation>Kopier som</translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation>Kopier samme katalog</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>Flytt</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Slett</translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation>Legg til Dokumenter</translation>
     </message>
     <message>
         <source>Run Command</source>
         <translation>Utfør kommando</translation>
     </message>
     <message>
         <source>File Info</source>
         <translation>Fil info</translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation>Sett rettigheter</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Rettigheter</translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation>Beam fil</translation>
     </message>
     <message>
         <source>AdvancedFm</source>
         <translation>AvansertFm</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Fil</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Vis</translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation>Utfør kommando med utskrift</translation>
     </message>
     <message>
         <source>Select All</source>
         <translation>Velg alle</translation>
     </message>
     <message>
         <source>Bookmark Directory</source>
         <translation>Bokmerke katalog</translation>
     </message>
     <message>
         <source>Remove Current Directory from Bookmarks</source>
         <translation>Fjern denne katalogen fra bokmerker</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Størrelse</translation>
     </message>
     <message>
         <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>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Feil</translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>Kunne ikke endre filnavn</translation>
     </message>
     <message>
         <source>File Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AdvancedFm :: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> kB free</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to View 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to View 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not Yet Implemented</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&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>
         <source>Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1 files?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1 and all it&apos;s contents?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really copy %1 files?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 already  exists. Ok to overwrite?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Could not copy %1 to %2&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy %1 As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt; %1 already exists. Ok to overwrite?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not copy %1 to %2&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt; %1 already exists. Do you really want to delete it?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not move %1&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not copy %1 to %2&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Output</source>
         <translation>Utskrift</translation>
     </message>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Lagre utskrift til fil (bare navn)</translation>
     </message>
     <message>
         <source>Process could not start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Finished
 </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Sett fil rettigheter</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Sett fil rettighter for:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>eier</translation>
     </message>
     <message>
         <source>group</source>
         <translation>gruppe</translation>
     </message>
     <message>
         <source>others</source>
         <translation>andre</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Eier</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Gruppe</translation>
     </message>
     <message>
         <source>read</source>
         <translation>lese</translation>
     </message>
     <message>
         <source>write</source>
         <translation>skrive</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>utføre</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>filePermissions</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,293 +1,233 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Appearance</name>
     <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>Stiler kontroller måten objekter som knapper og rullefelt vises på i alle applikasjoner
 
 Klikk her for å velge en av de tilgjengelige stilene.</translation>
     </message>
     <message>
         <source>Settings...</source>
         <translation>Innstillinger...</translation>
     </message>
     <message>
         <source>Click here to configure the currently selected style.
 
 Note:  This option is not available for all styles.</source>
         <translation>Klikk her for å konfigurere den valgte stilen.
 
 Merk: Dette valget er ikke tilgjengelig for alle stiler.</translation>
     </message>
     <message>
         <source>Window decorations control the way the application title bar and its buttons appear.
 
 Click here to select an available decoration.</source>
         <translation>Vindusdekorer kontroller måten applikasjoners tittellinje og knapper vises.
 
 Klikk her for å velge en tilgjengelig dekor.</translation>
     </message>
     <message>
         <source>Select the desired name, style and size of the default font applications will use.</source>
         <translation>Velg ønsket navn, stil og størrelse på standard tegnsett som applikasjonene vil bruke.</translation>
     </message>
     <message>
         <source>Color schemes are a collection of colors which are used for various parts of the display.
 
 Click here to select an available scheme.</source>
         <translation>Fargesystemer er en samling av farger som blir brukt av forskjellige deler av visningen.
 
 Klikk her for å velge et tilgjengelig fargesystem.</translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation>Nåværende fargesystem</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>Rediger...</translation>
     </message>
     <message>
         <source>Click here to change the colors in the current color scheme.</source>
         <translation>Klikk her for å endre farger i nåværende fargesystem.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Slett</translation>
     </message>
     <message>
         <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:
 
 1. Faner - normale faner med bare tekst
 2. Faner m/ikoner - faner med ikoner for hver fane og hvor tekst kun vises på aktiv fane
 3. Rullegardinmeny - en vertikal liste av faner
 4. Rullegardinmeny m/ikoner - en vertikal liste av faner med ikoner </translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Faner</translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
         <translation>Faner m/ikoner</translation>
     </message>
     <message>
         <source>Drop down list</source>
         <translation>Rullegardinmeny</translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation>Rullegardinmeny m/ikoner</translation>
     </message>
     <message>
         <source>Top</source>
         <translation>Topp</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation>Klikk her slik at fanene vises på toppen av vinduet.</translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation>Bunn</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation>Klikk her slik at fanene vises på bunnen av vinduet.</translation>
     </message>
     <message>
         <source>Rotation direction:</source>
         <translation>Rotasjonsretning:</translation>
     </message>
     <message>
         <source>Appearance Settings</source>
         <translation>Visningsinnstillinger</translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation>Dette er et forhåndsvisningsvindu. Kikk her for å se din nye visning da innstillingene er endret.</translation>
     </message>
     <message>
         <source>Style</source>
         <translation>Stil</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Tegnsett</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Farger</translation>
     </message>
     <message>
         <source>Windows</source>
         <translation>Vinduer</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Avansert</translation>
     </message>
     <message>
-        <source>Restart</source>
-        <translation 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>
         <translation>Rediger system</translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation>Klikk her for å velge farge for:</translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
         <translation>Prøve</translation>
     </message>
     <message>
         <source>Normal Item</source>
         <translation>Normalt objekt</translation>
     </message>
     <message>
         <source>Disabled Item</source>
         <translation>Avslått objekt</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Meny</translation>
     </message>
     <message>
         <source>Normal Text</source>
         <translation>Normal Tekst</translation>
     </message>
     <message>
         <source>Highlighted Text</source>
         <translation>Markert Tekst</translation>
     </message>
     <message>
         <source>Button</source>
         <translation>Knapp</translation>
     </message>
     <message>
         <source>Check Box</source>
         <translation>Avkrysningsboks</translation>
     </message>
     <message>
         <source>Sample window using the selected settings.</source>
         <translation>Prøvevindu som viser valgte innstillinger.</translation>
     </message>
 </context>
 </TS>
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
@@ -99,573 +99,565 @@
 **** Bruker har klikket AVBRYT ****</translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation>**** Prosessen er blitt avbrutt ****</translation>
     </message>
     <message>
         <source>Save output</source>
         <translation>Lagre utdata</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Ukjent</translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation>Valg</translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation>Tving avhengigheter</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation>Tving reinstallering</translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation>Tving sletting</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation>Tving overskrivning</translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation>Informasjonsnivå</translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation>Kun feil</translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation>Normale meldinger</translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation>Informative meldinger</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation>Feilsøking utdata</translation>
     </message>
 </context>
 <context>
     <name>Ipkg</name>
     <message>
         <source>Dealing with package %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing symbolic links...
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Creating symbolic links for %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Creating symbolic links for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing status entry...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>status file - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>package - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>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>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation>AQPkg - Pakke behandler</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation>Skriv teksten for å lete her.</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation>Klikk her for å skjule snarvei verktøylinjen.</translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation>Oppdater lister</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation>Klikk her for å oppdatere pakkelister fra servere.</translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation>Oppgrader</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation>Klikk her for å oppgradere alle installerte pakker dersom en nyere versjon er tilgjengelig.</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Last ned</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation>Klikk her for å laste ned de valgte pakkene. </translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation>Oppdater endringer</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation>Klikk her for installere, fjerne eller oppgradere valgte pakker.</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Handlinger</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation>Vis ikke-installerte pakker</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation>Klikk her for å vise pakker som er tilgjengelige, men som ikke er installert.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation>Vis installerte pakker</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation>Klikk her for å vise pakker som er installert på denne enheten.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation>Vis oppdaterte pakker</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation>Klikk her for å vise pakker som er installert på enheten som har en nyere versjon tilgjengelig.</translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation>Filtrer etter kategori</translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation>Klikk her for vise liste over pakker som tilhører en kategori.</translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation>Sett filtrer kategori</translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation>Klikk her for å endre pakke kategori til brukt filter.</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Finn</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation>Klikk her for å søke etter tekst i navnene til pakkene.</translation>
     </message>
     <message>
         <source>Find next</source>
         <translation>Finn neste</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation>Klikk her for å finne den neste pakken som inneholder teksten som du søker etter.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation>Snarvei tastatur</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation>Klikk her for å vise/skjule tastatur for å tillate hurtig bevegelse gjennom pakkelisten.</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Vis</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Konfigurer</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation>Klikk her for å konfigurere denne applikasjonen.</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation>Klikk her for å skjule Søk verktøylinjen.</translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation>Servere:</translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation>Klikk her for å velge en pakke tilførselskanal.</translation>
     </message>
     <message>
         <source>Packages</source>
         <translation>Pakker</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 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>Dette er en liste over alle pakker tilgjengelige fra de ovenfor valgte servere.  
 
 Et blått punkt ved siden av navnet på pakken indikerer at pakken er installert.
 
 Et blått punkt med en stjerne viser at en nyere versjon av pakken er tilgjengelig for nedlasting.</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Slett</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation>Klikk her for å slette valgte pakker.</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation>Bygger server liste
 </translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation>Bygger pakkeliste for:
 </translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
         <translation>Oppdaterer pakkelister fra server</translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation>ADVARSEL: Oppgradering mens
 Opie/qtopia kjører
 er IKKE anbefalt!</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Advarsel</translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
         <translation>Oppgraderer installerte pakker</translation>
     </message>
     <message>
         <source>Are you sure you wish to delete
 %1?</source>
         <translation>Er du sikker på at du ønsker å slette
 %1?</translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation>Er du sikker?</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nei</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
         <source>Download to where</source>
         <translation>Laste ned til?</translation>
     </message>
     <message>
         <source>Enter path to download to</source>
         <translation>Skriv sti til nedlast til</translation>
     </message>
     <message>
         <source>Install Remote Package</source>
         <translation>Installer ekstern pakke</translation>
     </message>
     <message>
         <source>Enter package location</source>
         <translation>Skriv sti for pakke</translation>
     </message>
     <message>
         <source>Nothing to do</source>
         <translation>Intet å gjøre</translation>
     </message>
     <message>
         <source>No packages selected</source>
         <translation>Ingen pakker valgt</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Do you wish to remove or reinstall
 %1?</source>
         <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>
         <translation>&lt;p&gt;&lt;b&gt;Innstallert til&lt;/b&gt; -</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Størrelse&lt;/b&gt; -</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Seksjon&lt;/b&gt; -</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Filnavn&lt;/b&gt; -</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Versjon installert&lt;/b&gt; -</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Versjon tilgjengelig&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Package Information</source>
         <translation>Pakke informasjon</translation>
     </message>
     <message>
         <source>Package information is unavailable</source>
         <translation>Pakke informasjon er ikke tilgjengelig</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Lukk</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Local packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>N/A</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package - %1
               version - %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
               inst version - %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Version string is empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Epoch in version is not number.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nothing after colon in version number.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QuestionDlg</name>
     <message>
         <source>Remove</source>
         <translation type="unfinished">Slett</translation>
     </message>
 </context>
 <context>
     <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation>Innstillinger</translation>
     </message>
     <message>
         <source>Servers</source>
         <translation>Servere</translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation>Destinasjoner</translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation>Proxier</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Ny</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Slett</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Navn:</translation>
     </message>
     <message>
         <source>Address:</source>
         <translation>Adresse:</translation>
     </message>
     <message>
         <source>Active Server</source>
         <translation>Aktiv server</translation>
     </message>
     <message>
         <source>Update</source>
         <translation>Oppdater</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation>Destinasjon</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Sted:</translation>
     </message>
     <message>
         <source>Link to root</source>
         <translation>Lenke til root</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
         <translation>HTTP Proxy</translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation>Tilgjengelig</translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation>FTP Proxy</translation>
     </message>
     <message>
         <source>Username:</source>
         <translation>Brukernavn:</translation>
     </message>
     <message>
         <source>Password:</source>
         <translation>Passord:</translation>
     </message>
 </context>
 </TS>
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
@@ -1,283 +1,206 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AlarmDlg</name>
     <message>
         <source>Clock</source>
         <translation type="unfinished">Klokke</translation>
     </message>
     <message>
         <source>Snooze</source>
         <translation type="unfinished">Blunde</translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AlarmDlgBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>TextLabel1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Snooze</source>
         <translation type="unfinished">Blunde</translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thu</source>
         <comment>Thursday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fri</source>
         <comment>Friday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat</source>
         <comment>Saturday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sun</source>
         <comment>Sunday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lap/Split</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Daily Alarm:&lt;/b&gt;&lt;p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily alarm requires at least
 one day to be selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished">Alle</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished">Lyd</translation>
     </message>
 </context>
 <context>
     <name>ClockBase</name>
     <message>
         <source>Clock</source>
         <translation type="unfinished">Klokke</translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stopwatch</source>
         <translation type="unfinished">Stoppeklokke</translation>
     </message>
     <message>
         <source>Split</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished">Start</translation>
     </message>
     <message>
         <source>Starts and stops the stopwatch.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lap/Split</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Resets the stopwatch.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check to enable the daily alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the hour the alarm will sound.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the minute the alarm will sound.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished">AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished">PM</translation>
     </message>
     <message>
         <source>Days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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
@@ -1,723 +1,731 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Continue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error box</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>This is an all day event.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this occurence</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Views</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
+    <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>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstEvent</name>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Start Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Silent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start time</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>nd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>rd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>th</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</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,71 +1,68 @@
 <!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>
     </message>
     <message>
         <source>Stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
         <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>
     </message>
 </context>
 </TS>
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
@@ -1,300 +1,328 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BaseSetup</name>
     <message>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slideshow timeout:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Toggle autoscale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to next image</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Delete Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Image Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></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>Browser Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Keyboard Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie Eye - Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Imageinfo Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Imageview Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Go dir up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start slideshow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and Imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show images fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto rotate images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show images unscaled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show zoomer window when unscaled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
     <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>
         <source>&lt;center&gt;&lt;b&gt;Be carefull with the following options!&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show files recursive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recursion depth:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Digital Camera View</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Name Only</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>imageinfo</name>
     <message>
         <source>View Full Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays an thumbnail of the image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays info of selected image</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,817 +1,878 @@
 <!DOCTYPE TS><TS>
 <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>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerUI</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposeMail</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please create an SMTP account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a File.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Store message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Store message into drafts?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Attachments will not be stored in &quot;Draft&quot; folder&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Receiver specified</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposeMailUI</name>
     <message>
         <source>Compose Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>send later</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>use:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BCC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <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>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>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete the selected Account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select an account.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccountsUI</name>
     <message>
         <source>Configure Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>News</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IMAPconfigUI</name>
     <message>
         <source>Configure IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefix</source>
         <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>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>
     </message>
     <message>
         <source>Send queued mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show/Hide folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Newsgroups</source>
         <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>
     </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>
 <context>
     <name>NNTPconfigUI</name>
     <message>
         <source>Configure NNTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Newsgroup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get newsgroup list from server</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Newmdirdlgui</name>
     <message>
         <source>Enter directory name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directory name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directory contains other subdirs</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <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>
     </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>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></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>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec imapd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>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>
     </message>
     <message>
         <source>Use Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the SMTP Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port of the SMTP Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SelectMailTypeUI</name>
     <message>
         <source>Select Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Account Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>POP3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SMTP</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SettingsDialogUI</name>
     <message>
         <source>Settings Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View mail as Html</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compose Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mails later ( enqueue in outbox )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></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>
     </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>
     </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>
     </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>
     </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>
     </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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Store mail(s) to&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Folder:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create new folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefix will prepend, no need to enter it!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move mail(s)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,832 +1,566 @@
 <!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>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <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>
         <source>&amp;Import text file</source>
         <translation>Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
         <translation>Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
         <translation>&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation 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>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation 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>
         <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
         <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
         <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
         <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
         <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
         <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
         <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
         <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
         <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
         <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
         <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
         <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
         <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
         <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
         <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
         <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
-        <source>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>
         <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No document defined.
 You have to create a new document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to save </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 before continuing?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Now you have to enter
 a password twice for your
 newly created document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&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>
         <source>&lt;P&gt;You must create a new document first. Ok to create?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Password Manager&lt;br&gt;ZSafe version 2.1.2&lt;br&gt;&lt;/b&gt;by Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Translations by Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,569 +1,489 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation>Pełna nazwa</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Kontakt</translation>
     </message>
     <message>
         <source>Pick</source>
         <translation>Wybór</translation>
     </message>
 </context>
 <context>
     <name>AbView</name>
     <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>
         <source>Unable to find a contact for this search pattern!</source>
         <translation>Nie znaleziono wizytówki odpowiadającej
 warunkom wyszukiwania!</translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation>Wybrany plik
 nie ma rozszerzenia &quot;.vcf&quot;.
 Czy na pewno chcesz go otworzyć?</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>Dodać wizytówkę?</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>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation>Styl zapytania</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>Używaj wyrażeń regularnych</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>Używaj znaków specjalnych (*,?)</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Wielkość liter znacząca</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Poczta</translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation>Preferuj QT-Mail</translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation>Preferuj Opie-Mail</translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation>Uwaga: QT-mail jest załączony
 jedynie w oryginalnym ROM&apos;ie
 SHARP&apos;a. Opie-Mail jest
 dostępny za darmo!</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Różne</translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation>Ustawienia wyszukiwania</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Czcionka</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Mała</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normalna</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Duża</translation>
     </message>
     <message>
         <source>Order</source>
         <translation>Kolejność</translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation>Wybierz kolejność wizytówek:</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Góra</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Dół</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Dodaj</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Usuń</translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation>Konfiguracja</translation>
     </message>
     <message>
         <source>Click on tab to select one</source>
         <translation>Kliknij w zakładkę aby ją wybrać</translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation>Ustawienia stylu zapytania</translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation>Obiekt wyszukiwarki będzie oczekiwał wyrażeń regularnych</translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
         <translation>Obiekt wyszukiwarki oczekuje tylko prostych znaków specjalnych</translation>
     </message>
     <message>
         <source>If selected, search differs between upper and lower chars</source>
         <translation>Wyszukiwarka będzie rozróżniała wielkość znaków</translation>
     </message>
     <message>
         <source>Font size for list- and card view</source>
         <translation>Wielkość czcionki dla listy i wizytówki</translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
         <translation>Ustawienia czcionki dla listy i wizytówki</translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation>Używaj aplikacji pocztowej Sharp&apos;a, jeśli jest dostępna</translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</source>
         <translation>Używaj aplikacji pocztowej OPIE, jeśli jest zainstalowana</translation>
     </message>
     <message>
         <source>Move selected attribute one line up</source>
         <translation>Przesuń wybrany atrybut o jedną pozycję do góry</translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation>Przesuń wybrany atrybut o jedną pozycję do dołu</translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation>Lista wszystkich dostępnych atrybutów</translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation>Dodaj wybrany atrybut z dolnej listy do górnej listy</translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation>Usuń wybrany atrybut z górnej listy</translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation>Kolejność (góra -&gt; dół) definiuje główny kontakt wyświetlany w drugiej kolumnie na liście wizytówek</translation>
     </message>
     <message>
         <source>Tool-/Menubar</source>
         <translation>Narzędzia/Menu</translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation>Stałe</translation>
     </message>
     <message>
         <source>Switch to fixed menu-/toolbars after restarting application !</source>
         <translation>Zmień Narzędzia/Menu na Stałe po ponownym uruchomieniu programu!</translation>
     </message>
     <message>
         <source>Moveable</source>
         <translation>Ruchome</translation>
     </message>
     <message>
         <source>Switch to moveable menu-/toolbars after restarting application !</source>
         <translation>Zmień Narzędzia/Menu na Ruchome po ponownym uruchomieniu programu!</translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>First Name</source>
         <translation>Imię</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Drugie imię</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Nazwisko</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Tytuł</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Pokazuj jako</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Płeć</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Stanowisko</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Miasto</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Region</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>Kraj</translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation>Pełna nazwa...</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Organizacja</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategoria</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Notatki...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Podstawowe</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Firma</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Dom</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Adres</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>Kod pocztowy</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>Stany Zjednoczone</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Anglia</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation>Albania</translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation>Algieria</translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation>Samoa Amerykańska</translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation>Andora</translation>
     </message>
     <message>
         <source>Angola</source>
         <translation>Angola</translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation>Anguilla</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>Argentyna</translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation>Aruba</translation>
     </message>
     <message>
         <source>Australia</source>
         <translation>Australia</translation>
     </message>
     <message>
         <source>Austria</source>
         <translation>Austria</translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation>Azerbejdzan</translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation>Bahama</translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation>Bahrain</translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation>Bangladesz</translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation>Barbados</translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation>Białoruś</translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation>Belgia</translation>
     </message>
     <message>
         <source>Belize</source>
         <translation>Belize</translation>
     </message>
     <message>
         <source>Benin</source>
         <translation>Benin</translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation>Bermudy</translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation>Bhutan</translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation>Botswana</translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation>Wyspa Bouvet</translation>
     </message>
     <message>
         <source>Brazil</source>
         <translation>Brazylia</translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
         <translation>Brunei</translation>
     </message>
     <message>
         <source>Bulgaria</source>
         <translation>Bułgaria</translation>
     </message>
     <message>
         <source>Burkina Faso</source>
         <translation>Burkina Faso</translation>
     </message>
     <message>
         <source>Burundi</source>
         <translation>Burundi</translation>
     </message>
     <message>
@@ -1013,552 +933,385 @@ dostępny za darmo!</translation>
     <message>
         <source>Peru</source>
         <translation>Peru</translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation>Filipiny</translation>
     </message>
     <message>
         <source>Poland</source>
         <translation>Polska</translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation>Portugalia</translation>
     </message>
     <message>
         <source>Puerto Rico</source>
         <translation>Puerto Rico</translation>
     </message>
     <message>
         <source>Qatar</source>
         <translation>Katar</translation>
     </message>
     <message>
         <source>Reunion</source>
         <translation>Reunion</translation>
     </message>
     <message>
         <source>Romania</source>
         <translation>Rumunia</translation>
     </message>
     <message>
         <source>Russia</source>
         <translation>Rosja</translation>
     </message>
     <message>
         <source>Rwanda</source>
         <translation>Rwanda</translation>
     </message>
     <message>
         <source>Saint Lucia</source>
         <translation>Saint Lucia</translation>
     </message>
     <message>
         <source>Samoa</source>
         <translation>Samoa</translation>
     </message>
     <message>
         <source>San Marino</source>
         <translation>San Marino</translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
         <translation>Arabia Saudyjska</translation>
     </message>
     <message>
         <source>Senegal</source>
         <translation>Senegal</translation>
     </message>
     <message>
         <source>Seychelles</source>
         <translation>Seszele</translation>
     </message>
     <message>
         <source>Sierra Leone</source>
         <translation>Sierra Leone</translation>
     </message>
     <message>
         <source>Singapore</source>
         <translation>Singapur</translation>
     </message>
     <message>
         <source>Slovakia</source>
         <translation>Słowacja</translation>
     </message>
     <message>
         <source>Slovenia</source>
         <translation>Słowenia</translation>
     </message>
     <message>
         <source>Solomon Islands</source>
         <translation>Wyspy Salomona</translation>
     </message>
     <message>
         <source>Somalia</source>
         <translation>Somalia</translation>
     </message>
     <message>
         <source>South Africa</source>
         <translation>Afryka Południowa</translation>
     </message>
     <message>
         <source>Spain</source>
         <translation>Hiszpania</translation>
     </message>
     <message>
         <source>Sri Lanka</source>
         <translation>Sri Lanka</translation>
     </message>
     <message>
         <source>St. Helena</source>
         <translation>Św. Helena</translation>
     </message>
     <message>
         <source>Sudan</source>
         <translation>Sudan</translation>
     </message>
     <message>
         <source>Suriname</source>
         <translation>Surinam</translation>
     </message>
     <message>
         <source>Swaziland</source>
         <translation>Suazi</translation>
     </message>
     <message>
         <source>Sweden</source>
         <translation>Szwecja</translation>
     </message>
     <message>
         <source>Switzerland</source>
         <translation>Szwajcaria</translation>
     </message>
     <message>
         <source>Taiwan</source>
         <translation>Tajwan</translation>
     </message>
     <message>
         <source>Tajikistan</source>
         <translation>Tadżykistan</translation>
     </message>
     <message>
         <source>Tanzania</source>
         <translation>Tanzania</translation>
     </message>
     <message>
         <source>Thailand</source>
         <translation>Tajlandia</translation>
     </message>
     <message>
         <source>Togo</source>
         <translation>Togo</translation>
     </message>
     <message>
         <source>Tokelau</source>
         <translation>Tokelau</translation>
     </message>
     <message>
         <source>Tonga</source>
         <translation>Tonga</translation>
     </message>
     <message>
         <source>Tunisia</source>
         <translation>Tunezja</translation>
     </message>
     <message>
         <source>Turkey</source>
         <translation>Turcja</translation>
     </message>
     <message>
         <source>Turkmenistan</source>
         <translation>Turkmenistan</translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation>Tuvalu</translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation>Uganda</translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation>Ukraina</translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation>Urugwaj</translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation>Uzbekistan</translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation>Vanuatu</translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation>Wenezuela</translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation>Wyspy Dziewicze</translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation>Zachodnia Sahara</translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation>Jemen</translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation>Jugosławia</translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation>Zambia</translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation>Zimbabwe</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Mężczyzna</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Kobieta</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Szczegóły</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>Wprowadź notatkę</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>Edytuj notatkę</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Kontakty</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Urodziny</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Rocznica</translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation>Kuwejt</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Nieznany</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Usuń</translation>
     </message>
     <message>
         <source>Afghanistan</source>
         <translation>Afganistan</translation>
     </message>
     <message>
         <source>Antarctica</source>
         <translation>Antarktyka</translation>
     </message>
     <message>
         <source>Armenia</source>
         <translation>Armenia</translation>
     </message>
     <message>
         <source>Bolivia</source>
         <translation>Boliwia</translation>
     </message>
     <message>
         <source>Cameroon</source>
         <translation>Kamerun</translation>
     </message>
     <message>
         <source>Ghana</source>
         <translation>Ghana</translation>
     </message>
     <message>
         <source>Guadeloupe</source>
         <translation>Gwadelupe</translation>
     </message>
     <message>
         <source>Guinea-Bissau</source>
         <translation>Gwinea-Bissau</translation>
     </message>
     <message>
         <source>Jamaica</source>
         <translation>Jamajka</translation>
     </message>
     <message>
         <source>Kiribati</source>
         <translation>Kiribati</translation>
     </message>
     <message>
         <source>Kyrgyzstan</source>
         <translation>Kirgistan</translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
         <translation>Autonomia Palestyńska</translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
         <translation>Pitcairn</translation>
     </message>
     <message>
         <source>Vietnam</source>
         <translation>Wietnam</translation>
     </message>
     <message>
         <source>Press to enter last- middle and firstname</source>
         <translation>Wciśnij by wprowadzić imiona i nazwisko</translation>
     </message>
     <message>
         <source>Enter fullname directly ! If you have a lastname with multiple words ( for instance &quot;de la Guerra&quot;), please write &lt;lastname&gt;,&lt;firstnames&gt; like this: &quot;de la Guerra, Carlos Pedro&quot;</source>
         <translation>Wpisz swoje dane dokładnie! Jeśli masz wieloczłonowe nazwisko (np. &quot;Van Helsing&quot;), wprowadź &lt;nazwisko&gt;,&lt;imiona&gt; w ten sposob: &quot;Van Helsing, Abraham&quot;</translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation>Stanowisko..</translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation>Na przykład &quot;jr&quot;..</translation>
     </message>
     <message>
         <source>The working place of the contact</source>
         <translation>Miejsce pracy z wizytówki</translation>
     </message>
     <message>
         <source>Press to select attribute to change</source>
         <translation>Wciśnij by wybrać atrybut do zmiany</translation>
     </message>
     <message>
         <source>Press to select how to store the name (and howto show it in the listview)</source>
         <translation>Wciśnij by wybrać sposób zapisania nazwiska (i jego prezentacji na liście)</translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie</name>
     <message>
         <source>Contact</source>
         <translation type="unfinished">Kontakt</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation type="unfinished">Kontakty</translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation type="unfinished">Szukaj</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation type="unfinished">Napisz e-mail do</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation type="unfinished">Importuj wizytówkę (vCard)</translation>
     </message>
     <message>
         <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
@@ -1,440 +1,358 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>AdvancedFm</source>
         <translation>AdvancedFm</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Plik</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Widok</translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation>Pokazuj ukryte pliki</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>Utworz folder</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Zmien nazwe</translation>
     </message>
     <message>
         <source>Run Command</source>
         <translation>Wykonaj polecenie</translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation>Wykonaj polecenie z wyswietleniem wyniku</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Usun</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Rozmiar</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Tak</translation>
     </message>
     <message>
         <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>
         <source>Ir sent.</source>
         <translation>Wiazka Ir wyemitowana.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>Zmien folder</translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>Wykonaj</translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation>Otworz jako tekst</translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation>Utworz dowiazanie</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Kopiuj</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>Przenies</translation>
     </message>
     <message>
         <source>File Info</source>
         <translation>Informacje o pliku</translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation>Ustaw uprawnienia</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Wlasciwosci</translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation>Emituj plik</translation>
     </message>
     <message>
         <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>
         <source>Switch to View 2</source>
         <translation>Przelacz na widok 2</translation>
     </message>
     <message>
         <source>Not Yet Implemented</source>
         <translation>Jeszcze niezaimplementowane</translation>
     </message>
     <message>
         <source>&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>
         <source>Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1 files?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1 and all it&apos;s contents?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really copy %1 files?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 already  exists. Ok to overwrite?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Could not copy %1 to %2&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy %1 As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt; %1 already exists. Ok to overwrite?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not copy %1 to %2&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt; %1 already exists. Do you really want to delete it?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not move %1&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not copy %1 to %2&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Zapisz wyjscie do pliku (tylko nazwa)</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Wyjscie</translation>
     </message>
     <message>
         <source>Process could not start</source>
         <translation>Proces nie mogl rozpoczac dzialania</translation>
     </message>
     <message>
         <source>Error
 </source>
         <translation>Blad</translation>
     </message>
     <message>
         <source>
 Finished
 </source>
         <translation>Skonczone</translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Ustaw uprawnienia pliku</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Ustaw uprawnienia pliku dla:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>wlasciciel</translation>
     </message>
     <message>
         <source>group</source>
         <translation>grupa</translation>
     </message>
     <message>
         <source>others</source>
         <translation>pozostali</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Wlasciciel</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Grupa</translation>
     </message>
     <message>
         <source>read</source>
         <translation>odczyt</translation>
     </message>
     <message>
         <source>write</source>
         <translation>zapis</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>wykonywanie</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Ostrzezenie</translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation>Blad - brak uzytkownika</translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation>Blad - brak grupy</translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation>Blad podczas ustawiania grupy</translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation>Blad podczas ustawiania uprawnien</translation>
     </message>
     <message>
         <source>filePermissions</source>
         <translation>uprawnieniaPliku</translation>
     </message>
 </context>
 </TS>
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
@@ -1,293 +1,233 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Appearance</name>
     <message>
         <source>Settings...</source>
         <translation>Ustawienia...</translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation>Aktualny szablon</translation>
     </message>
     <message>
         <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>
         <source>Drop down list</source>
         <translation>Lista rozwijana</translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation>Lista rozwijana z ikonami</translation>
     </message>
     <message>
         <source>Top</source>
         <translation>Góra</translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation>Dół</translation>
     </message>
     <message>
         <source>Style</source>
         <translation>Styl</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Czcionka</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Kolory</translation>
     </message>
     <message>
         <source>Windows</source>
         <translation>Okna</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Zaawansowane</translation>
     </message>
     <message>
-        <source>Restart</source>
-        <translation 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.
 
 Uwaga: Ta opcja jest niedostepna dla niektorych stylow.</translation>
     </message>
     <message>
         <source>Window decorations control the way the application title bar and its buttons appear.
 
 Click here to select an available decoration.</source>
         <translation>Dekoracje okien określają wygląd listwy tytułowej aplikacji i wygląd przycisków na tej listwie.
 
 Kliknij tu aby wybrać dostepną dekorację.</translation>
     </message>
     <message>
         <source>Select the desired name, style and size of the default font applications will use.</source>
         <translation>Wybierz nazwę, styl i rozmiar domyślnej czcionki dla aplikacji.</translation>
     </message>
     <message>
         <source>Color schemes are a collection of colors which are used for various parts of the display.
 
 Click here to select an available scheme.</source>
         <translation>Szablony barw sa zestawem kolorów używanych w różnych wyświetlanych elementach.
 
 Kliknij tu aby wybrać dostępny schemat.</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation>Kliknij tu aby zakładki pojawiały się na górze okna.</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation>Kliknij tu aby zakładki pojawiały się na dole okna.</translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation>To jest okno podglądu. Możesz tu zobaczyć jak zmienia się wygląd wraz ze zmianami opcji.</translation>
     </message>
     <message>
         <source>Appearance Settings</source>
         <translation>Ustawienia wyglądu</translation>
     </message>
     <message>
         <source>Rotation direction:</source>
         <translation>Kierunek rotacji:</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>
         <translation>Edytuj szablon</translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation>Kliknij tu aby wybrać kolor dla:</translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
         <translation>Przykład</translation>
     </message>
     <message>
         <source>Normal Item</source>
         <translation>Normalna pozycja</translation>
     </message>
     <message>
         <source>Disabled Item</source>
         <translation>Nieaktywna pozycja</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Menu</translation>
     </message>
     <message>
         <source>Normal Text</source>
         <translation>Normalny tekst</translation>
     </message>
     <message>
         <source>Highlighted Text</source>
         <translation>Podświetlony tekst</translation>
     </message>
     <message>
         <source>Button</source>
         <translation>Przycisk</translation>
     </message>
     <message>
         <source>Check Box</source>
         <translation>Ptaszek</translation>
     </message>
     <message>
         <source>Sample window using the selected settings.</source>
         <translation>Przykładowe okno dla wybranych ustawień.</translation>
     </message>
 </context>
 </TS>
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
@@ -1,624 +1,592 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation>Filtr kategorii</translation>
     </message>
     <message>
         <source>Select one or more groups</source>
         <translation>Wybierz jedna lub wiecej grup</translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation>Czytam konfiguracje...</translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Anuluj</translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
         <translation>Zamknij</translation>
     </message>
     <message>
         <source>Remove
 </source>
         <translation>Usun
 </translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation>Instaluj</translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation>Aktualizuj
 </translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation>(Przeinstaluj)</translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation>(Aktualizuj)</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation>Cel</translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation>Dostepna przestrzen</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Wyjscie</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Start</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opcje</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Wszystkie</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Tekst</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation>Przerwij</translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation>
 **** Uzytkownik wcisnal PRZERWIJ ***</translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation>**** Proces przerwany ****</translation>
     </message>
     <message>
         <source>Save output</source>
         <translation>Zapisz wyjscie</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Nieznany</translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation>%1 Kb</translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation>Opcje</translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation>Wymus zaleznosci</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation>Wymus reinstalacje</translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation>Wymus usuniecie</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation>Wymus nadpisanie</translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation>Poziom informacji</translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation>Tylko bledy</translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation>Normalne wiadomosci</translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation>Wiadomosci informujace</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation>Komunikaty problemow</translation>
     </message>
 </context>
 <context>
     <name>Ipkg</name>
     <message>
         <source>Dealing with package %1</source>
         <translation>Przetwarzanie pakietu %1</translation>
     </message>
     <message>
         <source>Removing symbolic links...
 </source>
         <translation>Usuwanie linkow symbolicznych...
 </translation>
     </message>
     <message>
         <source>Creating symbolic links for %1.</source>
         <translation>Tworzenie linkow symbolicznych dla %1.</translation>
     </message>
     <message>
         <source>Creating symbolic links for %1</source>
         <translation>Tworzenie linkow symbolicznych dla %1</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>Skonczone</translation>
     </message>
     <message>
         <source>Removing status entry...</source>
         <translation>Usuwanie wpisu statusu...</translation>
     </message>
     <message>
         <source>status file - </source>
         <translation>plik statusu -</translation>
     </message>
     <message>
         <source>package - </source>
         <translation>pakiet - </translation>
     </message>
     <message>
         <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>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation>AQPkg - Manager Pakietow</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation>Wpisz tu tekst do wyszukania.</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation>Kliknij tu by ukryc listwe Quick Jump.</translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation>Aktualizuj liste</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation>Kliknij tu aby aktualizowac liste pakietow z serwera.</translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation>Aktualizuj</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation>Kliknij tu aby aktualizowac wszystkie zainstalowane pakiety, jasli dostepne sa nowsze wersje.</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Sciagaj</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation>Kliknij tu aby sciagnac aktualnie wybrane pakiety.</translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation>Zastosuj zmiany</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation>Kliknij tu aby instalowac, usunac lub aktualizowac aktualnie wybrane pakiety.</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Akcje</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation>Pokaz pakiety nie zainstalowane</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation>Kliknij tu aby wyswietlic dostepne pakiety, ktore nie zostaly zainstalowane.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation>Pokaz zainstalowane pakiety</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation>Kliknij tu aby wyswietlic zainstalowane na tym urzadzeniu pakiety.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation>Pokaz zaktualizowane pakiety</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation>Kliknij tu aby wyswietlic zainstalowane na tym urzadzeniu pakiety, dla ktorych dostepne sa nowsze wersje.</translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation>Filtruj po kategorii</translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation>Kliknij tu aby wyswietlic pakiety nalezace do jednej kategorii.</translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation>Ustaw kategorie filtrowania</translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation>Kliknij tu aby zmienic kategorie pakietow w uzywanym filtrze.</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Szukaj</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation>Kliknij tu aby wyszukac tekst w nazwach pakietow.</translation>
     </message>
     <message>
         <source>Find next</source>
         <translation>Znajdz nastepny</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation>Kliknij tu aby znalezc nastepna nazwe pakietu zawierajaca szukany tekst.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation>Klawiatura Quick Jump</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation>Kliknij tu aby pokazac/ukryc klawiature pozwalajaca na szybkie przegladanie listy pakietow.</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Widok</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Konfiguruj</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation>Kliknij tu aby skonfigurowac ta aplikacje.</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation>Kliknij tu aby ukryc pasek wyszukiwania.</translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation>Serwery:</translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation>Kliknij tu aby wybrac zrodlo pakietow (feed).</translation>
     </message>
     <message>
         <source>Packages</source>
         <translation>Pakiety</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 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>To jest lista wszystkich pakietow dostepnych z wybanego powyzej zrodla (feed).
 
 Niebieska kropka obok nazwy pakietu oznacza, ze jest on aktualnie zainstalowany.
 
 Niebieska kropka z gwiazdka oznacza, ze na serwerze jest dostepna nowsza wersja pakietu.
 
 Kliknij w okienko po lewej aby wybrac pakiet.</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Usun</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation>Kliknij tu aby odinstalowac aktualnie wybrane pakiety.</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation>Buduje liste serwerow:
 <byte value="x9"/>%1</translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation>Buduje liste pakietow dla:
 <byte value="x9"/>%1</translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
         <translation>Odswiezam liste pakietow serwera</translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation>OSTRZEZENIE: Aktualizacja w czasie
 gdy dziala Opie/Qtopia
 jest NIEZALECANE!
 
 Czy jestes pewien?</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Ostrzezenie</translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
         <translation>Aktualizuje zainstalowane pakiety</translation>
     </message>
     <message>
         <source>Are you sure you wish to delete
 %1?</source>
         <translation>Czy jestes pewien, ze chcesz usunac
 %1?</translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation>Czy jestes pewien?</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nie</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Tak</translation>
     </message>
     <message>
         <source>Download to where</source>
         <translation>Gdzie sciagac</translation>
     </message>
     <message>
         <source>Enter path to download to</source>
         <translation>Wpisz sciezke do ktorej sciagac</translation>
     </message>
     <message>
         <source>Install Remote Package</source>
         <translation>Instaluj Zdalny Pakiet</translation>
     </message>
     <message>
         <source>Enter package location</source>
         <translation>Wpisz lokalizacje pakietu</translation>
     </message>
     <message>
         <source>Nothing to do</source>
         <translation>Nic do roboty</translation>
     </message>
     <message>
         <source>No packages selected</source>
         <translation>Brak wybranych pakietow</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Do you wish to remove or reinstall
 %1?</source>
         <translation>Czy chcesz usunac lub przeinstalowac
 %1?</translation>
     </message>
     <message>
         <source>Remove or ReInstall</source>
         <translation>Usun lub Przeinstaluj</translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation>Przeinstaluj</translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation>Czy chcesz usunac lub aktualizowac
 %1?</translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation>Usun lub Aktualizuj</translation>
     </message>
     <message>
         <source>Updating Launcher...</source>
         <translation>Aktualizuje Launcher...</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>
         <translation>&lt;p&gt;&lt;b&gt;Zainstalowany&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Rozmiar&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Wybor&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Nazwa pliku&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Zainstalowana wersja&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Dostepna wersja&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>Package Information</source>
         <translation>Informacje o pakiecie</translation>
     </message>
     <message>
         <source>Package information is unavailable</source>
         <translation>Informacje o pakiecie niedostepne</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Zamknij</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Installed packages</source>
         <translation>Zainstalowane pakiety</translation>
     </message>
     <message>
         <source>Local packages</source>
         <translation>Lokalne pakiety</translation>
     </message>
     <message>
         <source>N/A</source>
         <translation>niedostepne</translation>
     </message>
     <message>
         <source>Package - %1
               version - %2</source>
         <translation>Pakiet - %1
              wersja - %2</translation>
     </message>
     <message>
         <source>
               inst version - %1</source>
         <translation>zainst. wersja - %1</translation>
     </message>
     <message>
         <source>Version string is empty.</source>
         <translation>Numer wersji jest pusty.</translation>
     </message>
     <message>
         <source>Epoch in version is not number.</source>
         <translation>Czas w wersji nie jest liczba.</translation>
     </message>
     <message>
         <source>Nothing after colon in version number.</source>
         <translation>Nie ma nic po dwukropku w numerze wersji.</translation>
     </message>
 </context>
 <context>
     <name>QuestionDlg</name>
     <message>
         <source>Remove</source>
         <translation>Usun</translation>
     </message>
 </context>
 <context>
     <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
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,169 +1,149 @@
 <!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>
     </message>
     <message>
         <source>Backup Failed!</source>
         <translation>Archiwizacja nie powiodła się!</translation>
     </message>
     <message>
         <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>
         <source>Restore Backup...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;%1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore</source>
         <translation type="unfinished">Odzyskiwanie</translation>
     </message>
     <message>
         <source>Would you really overwrite your local data?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <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>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ErrorDialog</name>
     <message>
         <source>Error Info</source>
         <translation>Informacje o błędzie</translation>
     </message>
     <message>
         <source>Error Message:</source>
         <translation>Treść błędu:</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
 </context>
 </TS>
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,339 +1,331 @@
 <!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>
         <source>CE</source>
         <translation>CE</translation>
     </message>
     <message>
         <source>log</source>
         <translation>log</translation>
     </message>
     <message>
         <source>ln</source>
         <translation>ln</translation>
     </message>
     <message>
         <source>(</source>
         <translation>(</translation>
     </message>
     <message>
         <source>)</source>
         <translation>)</translation>
     </message>
     <message>
         <source>sin</source>
         <translation>sin</translation>
     </message>
     <message>
         <source>cos</source>
         <translation>cos</translation>
     </message>
     <message>
         <source>tan</source>
         <translation>tan</translation>
     </message>
     <message>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
         <source>+/-</source>
         <translation>+/-</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>=</source>
         <translation>=</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>.</source>
         <translation>.</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <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>
         <translation>Waga</translation>
     </message>
     <message>
         <source>Distance</source>
         <translation>Odległości</translation>
     </message>
     <message>
         <source>Area</source>
         <translation>Powierzchnia</translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation>Temperatury</translation>
     </message>
     <message>
         <source>Volume</source>
         <translation>Objętości</translation>
     </message>
     <message>
         <source>acres</source>
         <translation>akry</translation>
     </message>
     <message>
         <source>&#xb0;C</source>
         <translation>°C</translation>
     </message>
     <message>
         <source>carats</source>
         <translation>karaty</translation>
     </message>
     <message>
         <source>cm</source>
         <translation>cm</translation>
     </message>
     <message>
         <source>cu cm</source>
         <translation>cm^3</translation>
     </message>
     <message>
         <source>cu ft</source>
         <translation>st^3</translation>
     </message>
     <message>
         <source>cu in</source>
         <translation>cal^3</translation>
     </message>
     <message>
         <source>&#xb0;F</source>
         <translation>°F</translation>
     </message>
     <message>
         <source>fl oz (US)</source>
         <translation type="unfinished">uncja fl (US)</translation>
     </message>
     <message>
         <source>ft</source>
         <translation>st</translation>
     </message>
     <message>
         <source>g</source>
         <translation>g</translation>
     </message>
     <message>
         <source>gal (US)</source>
         <translation>gal (US)</translation>
     </message>
     <message>
         <source>hectares</source>
         <translation>hektary</translation>
     </message>
     <message>
         <source>in</source>
         <translation>cal</translation>
     </message>
     <message>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
         <source>km</source>
         <translation>km</translation>
     </message>
     <message>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
         <source>lb</source>
         <translation>funt</translation>
     </message>
     <message>
         <source>Lg tons</source>
         <translation type="unfinished">tony Lg</translation>
     </message>
     <message>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
         <source>mg</source>
         <translation>mg</translation>
     </message>
     <message>
         <source>mi</source>
         <translation>mila</translation>
     </message>
     <message>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
         <source>mm</source>
         <translation>mm</translation>
     </message>
     <message>
         <source>naut. mi</source>
         <translation>mila mor</translation>
     </message>
     <message>
         <source>oz</source>
         <translation>uncja</translation>
     </message>
     <message>
         <source>points</source>
         <translation>punkty</translation>
     </message>
     <message>
         <source>pt</source>
         <translation type="unfinished">pt</translation>
     </message>
     <message>
         <source>qt</source>
         <translation type="unfinished">qt</translation>
     </message>
     <message>
         <source>sq cm</source>
         <translation>cm^2</translation>
     </message>
     <message>
         <source>sq ft</source>
         <translation>st^2</translation>
     </message>
     <message>
         <source>sq in</source>
         <translation>cal^2</translation>
     </message>
     <message>
         <source>sq km</source>
         <translation>km^2</translation>
     </message>
     <message>
         <source>sq m</source>
         <translation>m^2</translation>
     </message>
     <message>
         <source>sq mi</source>
         <translation>mila^2</translation>
     </message>
     <message>
         <source>sq mm</source>
         <translation>mm^2</translation>
     </message>
     <message>
         <source>sq yd</source>
         <translation>jard^2</translation>
     </message>
     <message>
         <source>st</source>
         <translation type="unfinished">st</translation>
     </message>
     <message>
         <source>St tons</source>
         <translation type="unfinished">tony st</translation>
     </message>
     <message>
         <source>tblspoon</source>
         <translation>łyżka stołowa</translation>
     </message>
     <message>
         <source>teaspoons</source>
         <translation>łyżeczka</translation>
     </message>
     <message>
         <source>tonnes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>yd</source>
         <translation>jard</translation>
     </message>
 </context>
 </TS>
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
@@ -1,754 +1,646 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation>Rachunek</translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation>Nowy rachunek</translation>
     </message>
     <message>
         <source>Info</source>
         <translation>Informacje</translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation>Transakcje</translation>
     </message>
     <message>
         <source>Charts</source>
         <translation>Wykresy</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nazwa:</translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation>Wpisz 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>
         <source>Enter account number for this checkbook here.</source>
         <translation>Wpisz tu numer konta dla rachunku.</translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation>Numer PIN:</translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation>Wpisz tu numer PIN dla rachunku.</translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation>Bilans początkowy:</translation>
     </message>
     <message>
         <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>
         <source>Description</source>
         <translation>Opis</translation>
     </message>
     <message>
         <source>Amount</source>
         <translation>Kwota</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nowa</translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation>Kliknij tu aby dodać nową transakcję.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Edytuj</translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation>Wybierz transakcję, a nastepnie kliknij tu by ją edytować.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Usuń</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation>Wybierz rachunek i kliknij tu aby go usunąć.</translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation>Wybierz pożądany wykres poniżej i kliknij na przycisk Rysuj.</translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation>Kliknij tu aby wybrać typ wykresu.</translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation>Bilans konta</translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation>Wypłaty wg kateorii</translation>
     </message>
     <message>
         <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>
         <source>Num</source>
         <translation>Nr</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Wpisz hasło</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Proszę wpisać swoje hasło:</translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation>Potwierdź hasło</translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation>Proszę potwierdzić swoje hasło:</translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation>Proszę wpisać swoje hasło aby potwierdzić zniesienie ochrony hasłem:</translation>
     </message>
     <message>
         <source>Sort by:</source>
         <translation>Sortuj wg:</translation>
     </message>
     <message>
         <source>Select checkbook sorting here.</source>
         <translation>Wybierz tu sposób sortowania dla rachunku.</translation>
     </message>
     <message>
         <source>Entry Order</source>
         <translation>Kolejność wpisów</translation>
     </message>
     <message>
         <source>Number</source>
         <translation>Numer</translation>
     </message>
     <message>
         <source>Id</source>
         <translation>ID</translation>
     </message>
     <message>
         <source>SortDate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>Bilans</translation>
     </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation>Konfiguruj rachunek</translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation>Podaj symbol waluty:</translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation>Tu wpisz symbol swojej lokalnej waluty.</translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation>Pokaż czy rachunek jest chroniony
 hasłem</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
         <translation>Kliknij tu by zdecydować, czy okno główne ma pokazywać czy rachunek jest chroniony hasłem.</translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation>Pokaż bilanse rachunków</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation>Kliknij tu by zdecydować, czy okno główne ma pokazywać aktualny bilans każdego rachunku.</translation>
     </message>
     <message>
         <source>&amp;Settings</source>
         <translation>&amp;Ustawienia</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
         <source>New Account Type</source>
         <translation>Typ nowego konta</translation>
     </message>
     <message>
         <source>&amp;Account Types</source>
         <translation>&amp;Typy kont</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategoria</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>Nowa kategoria</translation>
     </message>
     <message>
         <source>Expense</source>
         <translation>Wydatki</translation>
     </message>
     <message>
         <source>Income</source>
         <translation>Wpływy</translation>
     </message>
     <message>
         <source>&amp;Categories</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>Payee</source>
         <translation>Odbiorca</translation>
     </message>
     <message>
         <source>New Payee</source>
         <translation>Nowy odbiorca</translation>
     </message>
     <message>
         <source>&amp;Payees</source>
         <translation>&amp;Odbiorcy</translation>
     </message>
     <message>
         <source>Open last checkbook</source>
         <translation>Otwórz ostatni rachunek</translation>
     </message>
     <message>
         <source>Click here to select whether the last open checkbook will be opened at startup.</source>
         <translation>Kliknij tu by zdecydować czy ostatni otwarty rachunek ma być otwierany przy starcie.</translation>
     </message>
     <message>
         <source>Show last checkbook tab</source>
         <translation>Pokazuj ostatnią zakładkę rachunku</translation>
     </message>
     <message>
         <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
         <translation>Kliknij tu by zdecydować czy pokazywana ma być ostatnia zakładka rachunku.</translation>
     </message>
     <message>
         <source>Save new description as payee</source>
         <translation>Zapisz nowy opis jako odbiorcę</translation>
     </message>
     <message>
         <source>Click here to save new descriptions in the list of payess.</source>
         <translation>Kliknij tu aby zapisać nowe opisy na liście odbiorców.</translation>
     </message>
 </context>
 <context>
     <name>ListEdit</name>
     <message>
         <source>Add</source>
         <translation>Dodaj</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Usuń</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation>Rachunek</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nowy</translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation>Kliknij tu aby stworzyć nowy rachunek.
 
 Możesz również wybrać Nowy z menu Rachunek.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Edytuj</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation>Wybierz rachunek i kliknij tu aby go edytować.
 
 Możesz również wybrać Edytuj z menu Rachunek albo kliknąć i przytrzymać nazwę rachunku.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Usuń</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation>Wybierz rachunek i kliknij tu aby go usunąć.
 
 Możesz również wybrać Usuń z menu Rachunek.</translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation>To jest lista wszystkich aktualnie dostępnych rachunków.</translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation>Usuń rachunek</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Konfiguruj</translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation>Kliknij tu aby skonfigurować tą aplikcaję.</translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation>Nazwa rachunku</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>Bilans</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Podaj hasło</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Proszę podać swoje hasło:</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Edytuj</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nowa</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Usuń</translation>
     </message>
     <message>
         <source>Savings</source>
         <translation>Oszczędności</translation>
     </message>
     <message>
         <source>Checking</source>
         <translation type="unfinished">Czeki</translation>
     </message>
     <message>
         <source>CD</source>
         <translation>CD</translation>
     </message>
     <message>
         <source>Money market</source>
         <translation>Rynek finansowy</translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation>Fundusz wspólny</translation>
     </message>
     <message>
         <source>Other</source>
         <translation>Inne</translation>
     </message>
     <message>
         <source>Expense</source>
         <translation>Wydatek</translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation>Samochód</translation>
     </message>
     <message>
         <source>Bills</source>
         <translation>Rachunki</translation>
     </message>
     <message>
         <source>CDs</source>
         <translation>Płyty CD</translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation>Ubrania</translation>
     </message>
     <message>
         <source>Computer</source>
         <translation>Komputer</translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation>Płyty DVD</translation>
     </message>
     <message>
         <source>Electronics</source>
         <translation>Elektronika</translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation>Rozrywka</translation>
     </message>
     <message>
         <source>Food</source>
         <translation>Żywność</translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation>Bezyna</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Różne</translation>
     </message>
     <message>
         <source>Movies</source>
         <translation>Filmy</translation>
     </message>
     <message>
         <source>Rent</source>
         <translation>Czynsz</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Podróż</translation>
     </message>
     <message>
         <source>Income</source>
         <translation>Wpływ</translation>
     </message>
     <message>
         <source>Work</source>
         <translation>Praca</translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation>Członek rodziny</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation>Różne Kredyt</translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation>Transakcja dla</translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation>Wypłata</translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation>Wybierz tu czy transakcja jest wypłatą czy wpłatą.</translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation>Wpłata</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Data:</translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation>Tu wybierz datę transakcji.</translation>
     </message>
     <message>
         <source>Number:</source>
         <translation>Numer:</translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation>Wpisz tu numer czeku.</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Opis:</translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation>Tu wpisz opis transakcji.</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategoria:</translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation>Wybierz tu kategorię transakcji.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Typ:</translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation>Tu wybierz typ transakcji.
 
 Dostepność opcji jest uzależniona od tego, czy transakcja jest wpłatą czy wypłatą.</translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation>Kwota:</translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation>Wpisz tu kwotę transakcji.
 
 Wartość ta powinna być zawsze liczbą dodatnią.</translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation>Prowizja:</translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation>Wpisz wszelkie opłaty/prowizje związana z tą transakcją.
 
 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
@@ -1,287 +1,206 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AlarmDlg</name>
     <message>
         <source>Clock</source>
         <translation type="unfinished">Zegar</translation>
     </message>
     <message>
         <source>Snooze</source>
         <translation type="unfinished">Drzemka</translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AlarmDlgBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>TextLabel1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Snooze</source>
         <translation type="unfinished">Drzemka</translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thu</source>
         <comment>Thursday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fri</source>
         <comment>Friday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat</source>
         <comment>Saturday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sun</source>
         <comment>Sunday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lap/Split</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Daily Alarm:&lt;/b&gt;&lt;p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily alarm requires at least
 one day to be selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished">Wszystkie</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished">Audio</translation>
     </message>
 </context>
 <context>
     <name>ClockBase</name>
     <message>
         <source>Clock</source>
         <translation type="unfinished">Zegar</translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stopwatch</source>
         <translation type="unfinished">Stoper</translation>
     </message>
     <message>
         <source>Split</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished">Uruchom</translation>
     </message>
     <message>
         <source>Starts and stops the stopwatch.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lap/Split</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Resets the stopwatch.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check to enable the daily alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the hour the alarm will sound.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the minute the alarm will sound.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished">AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished">PM</translation>
     </message>
     <message>
         <source>Days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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
@@ -1,860 +1,829 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation>Kalendarz</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nowy</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>Dziś</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dzień</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Tydzień</translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation>Tydzień - lista</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Miesiąc</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Szukaj</translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation>Czas zdarzenia jest potencjalnie dluższy
 niż odstęp pomiędzy jego powtórzeniami.</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Nie można zmieniać danych podczas synchronizacji</translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation>Edytuj zdarzenie</translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation> minut)</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Brak miejsca w pamięci</translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation>Kaledarz nie może
 zapisać zmian.
 Zwolnij miejsce w pamięci i spróbuj ponownie.
 
 Wyjść?</translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation>(Nieznany)</translation>
     </message>
     <message>
         <source>Error!</source>
         <translation>Błąd!</translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation>Popraw to</translation>
     </message>
     <message>
         <source>Continue</source>
         <translation>Kontynuować</translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation>Duplikuj zdarzenie</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>Edytuj...</translation>
     </message>
     <message>
         <source>error box</source>
         <translation>okienko błędu</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation>M</translation>
     </message>
     <message>
         <source>T</source>
         <translation>T</translation>
     </message>
     <message>
         <source>W</source>
         <translation>W</translation>
     </message>
     <message>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Poniedziałek</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Wtorek</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Środa</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Czwartek</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Piątek</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sobota</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Niedziela</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00p</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation>Od</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Do</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Edycja</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Usuń</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Emituj</translation>
     </message>
     <message>
         <source>This is an all day event.</source>
         <translation>To jest zdarzenie całodobowe.</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Czas</translation>
     </message>
     <message>
         <source> - </source>
         <translation>-</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplikuj</translation>
     </message>
     <message>
         <source>Beam this occurence</source>
         <translation>Emituj to wydarzenie</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation>:00 PM</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation>:00 AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Kalendarz</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>Ustawienia</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation>Rozpocznij przegląd zdarzeń</translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation>Czas poczatkowy:</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation>Ustawienia alarmu</translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation>Ustawienie alarmu</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation> minut</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Różne</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>Styl wierszy:</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Domyślne</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Średnie</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Duże</translation>
     </message>
     <message>
         <source>Views</source>
         <translation>Widoki</translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation>Domyślny widok:</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dzień</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Tydzień</translation>
     </message>
     <message>
         <source>Week List</source>
         <translation>Tydzień - lista</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Miesiąc</translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation>Skocz do &quot;dzisiaj&quot;</translation>
     </message>
     <message>
         <source>Time display</source>
         <translation>Wyświetlanie czasu</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Brak</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Początek</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation>Początek - koniec</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Domyślne</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Lokalizacja:</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Biuro</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Dom</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategoria:</translation>
     </message>
+    <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>
         <translation>t</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Sty-00. Sty</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
         <translation>PWŚCPSNP</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstEvent</name>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Edycja</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished">Duplikuj</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Usuń</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished">Emituj</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>t</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>T: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation>p</translation>
     </message>
-    <message>
-        <source>Mo</source>
-        <comment>Monday</comment>
-        <translation type="obsolete">Pn</translation>
-    </message>
-    <message>
-        <source>Tu</source>
-        <comment>Tuesday</comment>
-        <translation type="obsolete">Wt</translation>
-    </message>
-    <message>
-        <source>We</source>
-        <comment>Wednesday</comment>
-        <translation type="obsolete">Sr</translation>
-    </message>
-    <message>
-        <source>Th</source>
-        <comment>Thursday</comment>
-        <translation type="obsolete">Czw</translation>
-    </message>
-    <message>
-        <source>Fr</source>
-        <comment>Friday</comment>
-        <translation type="obsolete">Pt</translation>
-    </message>
-    <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>
         <source>Daily...</source>
         <translation>Dziennie...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>Tygodniowo...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>Miesięcznie...</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>Rocznie...</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Jednorazowe...</translation>
     </message>
     <message>
         <source>Start Time</source>
         <translation>Od</translation>
     </message>
     <message>
         <source>End Time</source>
         <translation>Do</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>Nowe zdarzenie</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Lokalizacja</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategoria</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Spotkanie</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Obiad</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Kolacja</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Podróż</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Biuro</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Dom</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>Sty 02 00</translation>
     </message>
     <message>
         <source>Start time</source>
         <translation>Początek</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Cały dzień</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Strefa czasowa</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Alarm</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation> minut</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Cichy</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Glośny</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Powtarzaj</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Nie powtarzaj</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Opis</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>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>
         <translation>Edytuj notatke</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Obiad</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Początek</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Koniec</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Co</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 co </translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>%1 co </translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>%1 %1 co </translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Co </translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Poniedziałek</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Wtorek</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Środa</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Czwartek</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Piątek</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sobota</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Niedziela</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>nd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>rd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>th</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation>Jednorazowe</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>dni</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>tygodni</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Powtarzaj według</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dnia</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Daty</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>miesiące</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>lata</translation>
     </message>
     <message>
         <source>days</source>
         <translation>dni</translation>
     </message>
     <message>
         <source>day</source>
         <translation>dzień</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>tygodnie</translation>
     </message>
     <message>
         <source>week</source>
         <translation>tydzień</translation>
     </message>
     <message>
         <source>month</source>
         <translation>miesiąc</translation>
     </message>
     <message>
         <source>year</source>
         <translation>rok</translation>
     </message>
     <message>
         <source> and </source>
         <translation> i </translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
 i </translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, i </translation>
     </message>
     <message>
         <source>on </source>
         <translation>w </translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Powtarzajace sie zdarzenie</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Brak</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dzien</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Tydzien</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Miesiac</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Rok</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Co:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Czestotliwosc</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Koniec:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Bez konca</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Powtarzaj w</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Pon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Wto</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Śro</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Czw</translation>
     </message>
     <message>
         <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>Every</source>
         <translation>Co</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>months</source>
         <translation>miesiące</translation>
     </message>
     <message>
         <source>years</source>
         <translation>lata</translation>
     </message>
 </context>
 </TS>
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,38 +1,28 @@
 <!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>
         <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 annoying...)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,313 +1,249 @@
 <!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>
         <source>Cyan on White</source>
         <translation>Cyjan na białym</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>Białe na cyjan</translation>
     </message>
     <message>
         <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>
         <source>Tab</source>
         <translation>Tabulator</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Góra</translation>
     </message>
     <message>
         <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>
         <source>ScrollBar</source>
         <translation>Przewijanie</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>Custom</source>
         <translation>Zdefiniuj</translation>
     </message>
     <message>
         <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>
         <source>Hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Pink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pink on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>new session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sessions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To exit fullscreen, tap here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History Lines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konsole </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Wybór polecenia</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation>Dodaj polecenie</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation>Wprowadź polecenie do dodania:</translation>
     </message>
 </context>
 </TS>
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
@@ -1,100 +1,96 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FifteenConfigDialog</name>
     <message>
         <source>All Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select board background</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FifteenConfigDialogBase</name>
     <message>
         <source>Configure Fifteen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use a Custom Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Path:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Preview:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Grid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Rows:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
 <context>
     <name>PiecesTable</name>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Pietnascie</translation>
     </message>
     <message>
         <source>Congratulations!
 You win the game!</source>
         <translation>Gratulacje!
 Wygrales gre!</translation>
     </message>
     <message>
         <source>R&amp;andomize Pieces</source>
         <translation>P&amp;omieszaj klocki</translation>
     </message>
     <message>
         <source>&amp;Reset Pieces</source>
         <translation>&amp;Resetuj klocki</translation>
     </message>
 </context>
 </TS>
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
@@ -1,220 +1,180 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FormatterApp</name>
     <message>
         <source>Formatter</source>
         <translation>Formater</translation>
     </message>
     <message>
         <source>Storage Type</source>
         <translation>Typ pamieci</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Formatter Output</source>
         <translation>Dane wyjsciowe Formatera</translation>
     </message>
     <message>
         <source>Trying to umount.</source>
         <translation>Probuje odmontowac.</translation>
     </message>
     <message>
         <source>umount failed!</source>
         <translation>odmontowanie sie nie powiodlo!</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
         <source>Could not umount.
 Device is busy!</source>
         <translation>Nie mozna odmontowac. Urzadzenie jest uzywane!</translation>
     </message>
     <message>
         <source>Trying to format.</source>
         <translation>Probuje formatowac.</translation>
     </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>
         <source>Available: %1 kB ( %d mB)</source>
         <translation>Dostepne: %1 kB ( %d mB)</translation>
     </message>
     <message>
         <source>CAUTION:
 Changing parameters on this
 page may cause your system
 to stop functioning properly!</source>
         <translation>UWAGA:
 Zmiana parametrow na tej
 stronie moe spowodowac nieprawidlowe
 funkcjonowanie systemu!</translation>
     </message>
     <message>
         <source>Format?</source>
         <translation>Formatowac?</translation>
     </message>
     <message>
         <source>
 with %1 filesystem?
 You will loose all data!!</source>
         <translation>
 na system %1?
 Stracisz wszystkie dane!!</translation>
     </message>
     <message>
         <source>Trying to umount %1.</source>
         <translation>Odmontowuje %1.</translation>
     </message>
     <message>
         <source>Trying to mount %1.</source>
         <translation>Montuje %1.</translation>
     </message>
     <message>
         <source>%1
 has been successfully mounted.</source>
         <translation>%1
 zostal zamontowany.</translation>
     </message>
     <message>
         <source>Storage Type: %1</source>
         <translation>Typ Nosnika: %1</translation>
     </message>
     <message>
         <source>Type: %1
 Formatted with %2
 %3, %4, %5</source>
         <translation>Typ: %1
 Zformatowany na %2
 %3, %4, %5</translation>
     </message>
 </context>
 </TS>
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
@@ -1,56 +1,52 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GoMainWidget</name>
     <message>
         <source>New Game</source>
         <translation>Nowa gra</translation>
     </message>
     <message>
         <source>Pass</source>
         <translation>Pas</translation>
     </message>
     <message>
         <source>Resign</source>
         <translation>Rezygnuj</translation>
     </message>
     <message>
         <source>Two player option</source>
         <translation>Opcja dla 2 graczy</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Gra</translation>
     </message>
 </context>
 <context>
     <name>GoWidget</name>
     <message>
         <source>White %1, Black %2. </source>
         <translation>Biale %1, Czarne %2.</translation>
     </message>
     <message>
         <source>White wins.</source>
         <translation>Biale wygraly.</translation>
     </message>
     <message>
         <source>Black wins.</source>
         <translation>Czarne wygraly.</translation>
     </message>
     <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
@@ -1,296 +1,292 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KRFBConnection</name>
     <message>
         <source>Connected</source>
         <translation>Polaczony</translation>
     </message>
     <message>
         <source>Connection Refused</source>
         <translation>Polaczenie odrzucone</translation>
     </message>
     <message>
         <source>Host not found</source>
         <translation>Nie znaleziono serwera</translation>
     </message>
     <message>
         <source>Read Error: QSocket reported an error reading
 data, the remote host has probably dropped the
 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>
         <source>Protocol Error: An unknown encoding was used by the server %1</source>
         <translation>Blad protokolu: Serwer %1 uzyl nieznanego kodowania</translation>
     </message>
     <message>
         <source>Waiting for server initialization...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KRFBLogin</name>
     <message>
         <source>Waiting for server version...</source>
         <translation>Oczekiwanie na wersje serwera...</translation>
     </message>
     <message>
         <source>Error: Invalid server version, %1</source>
         <translation>Blad: Niewlasciwa wersja serwera, %1</translation>
     </message>
     <message>
         <source>Error: Unsupported server version, %1</source>
         <translation>Blad: Nieobslugiwana wersja serwera, %1</translation>
     </message>
     <message>
         <source>Logged in</source>
         <translation>Zalogowany</translation>
     </message>
     <message>
         <source>Error: This server requires a password, but none has been specified.
 </source>
         <translation>Blad: Serwer zazadal hasla, ale zadne nie zostalo podane.
 </translation>
     </message>
     <message>
         <source>Error: The password you specified was incorrect.</source>
         <translation>Blad: Podane haslo jest nieprawidlowe.</translation>
     </message>
     <message>
         <source>Error: Too many invalid login attempts have been made
 to this account, please try later.</source>
         <translation>Blad: Zbyt wiele nieudanych prob logowania na to konto,
 sprobuj pozniej.</translation>
     </message>
     <message>
         <source>Login Failed</source>
         <translation>Blad logowania</translation>
     </message>
     <message>
         <source>Too many failures</source>
         <translation>Zbyt duzo bledow</translation>
     </message>
 </context>
 <context>
     <name>KVNC</name>
     <message>
         <source>VNC Viewer</source>
         <translation>Klient VNC</translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation>Caly ekran</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>Rozlaczono</translation>
     </message>
     <message>
         <source>Stop Full Screen</source>
         <translation>Do okna</translation>
     </message>
     <message>
         <source>Connected to remote host</source>
         <translation>Polaczono do zdalnego serwera</translation>
     </message>
     <message>
         <source>Logged in to remote host</source>
         <translation>Zalogowano na zdalnym serwerze</translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation>Polaczenie zamkniete</translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation>Nowe polaczenie</translation>
     </message>
     <message>
         <source>Open Bookmark</source>
         <translation>Otworz zakladke</translation>
     </message>
     <message>
         <source>Delete Bookmark</source>
         <translation>Usun zakladke</translation>
     </message>
     <message>
         <source>Send Contrl-Alt-Delete</source>
         <translation>Wyslij Contrl-Alt-Delete</translation>
     </message>
     <message>
         <source>Next Click is Double Click</source>
         <translation>Natepne klikniecie to podwojne klikniecie</translation>
     </message>
     <message>
         <source>Next Click is Right Click</source>
         <translation>Nastepne klikniecie to prawy przycisk</translation>
     </message>
 </context>
 <context>
     <name>KVNCBookmarkDlgBase</name>
     <message>
         <source>Bookmarks</source>
         <translation>Zakladki</translation>
     </message>
     <message>
         <source>Choose a bookmark that you would like to open</source>
         <translation>Wybierz zakladke, ktora chcesz otworzyc</translation>
     </message>
 </context>
 <context>
     <name>KVNCConnDlgBase</name>
     <message>
         <source>VNC Viewer Connection</source>
         <translation>Polaczenie z VNC Viewer</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Serwer</translation>
     </message>
     <message>
         <source>Show Password</source>
         <translation>Pokaz haslo</translation>
     </message>
     <message>
         <source>Password:</source>
         <translation>Haslo:</translation>
     </message>
     <message>
         <source>Bookmark Name:</source>
         <translation>Nazwa zakladki:</translation>
     </message>
     <message>
         <source>Host Name:</source>
         <translation>Nazwa komputera:</translation>
     </message>
     <message>
         <source>Display Number:</source>
         <translation>Numer pulpitu:</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opcje</translation>
     </message>
     <message>
         <source>Check for screen updates every:</source>
         <translation>Sprawdz zmiany na pulpicie co:</translation>
     </message>
     <message>
         <source>Milliseconds</source>
         <translation>Milisekund</translation>
     </message>
     <message>
         <source>Request 8-bit session</source>
         <translation>Zazadaj 8-bit sesji</translation>
     </message>
     <message>
         <source>Raise on bell</source>
         <translation>Podnies z dzwonkiem</translation>
     </message>
     <message>
         <source>Request shared session</source>
         <translation>Zarzadaj wspoldzielonej sesji</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>Scale Factor</source>
         <translation>Wspolczynnik Skali</translation>
     </message>
     <message>
         <source>Encodings</source>
         <translation>Kodowania</translation>
     </message>
     <message>
         <source>Hextile encoding</source>
         <translation>Kodowanie Hextile</translation>
     </message>
     <message>
         <source>CoRRE encoding</source>
         <translation>Kodowanie CoRRE</translation>
     </message>
     <message>
         <source>RRE encoding</source>
         <translation>Kodowanie RRE</translation>
     </message>
     <message>
         <source>Copy rectangle encoding</source>
         <translation>Kopiuj kodowanie prostokata</translation>
     </message>
     <message>
         <source>The password of the VNC server</source>
         <translation>Haslo serwera VNC</translation>
     </message>
     <message>
         <source>Toggle obscuring the password</source>
         <translation>Przelacz maskowanie hasla</translation>
     </message>
     <message>
         <source>The name of the VNC server</source>
         <translation>Nazwa serwera VNC</translation>
     </message>
     <message>
         <source>The host name of the VNC server</source>
         <translation>Nazwa komputera serwera VNC</translation>
     </message>
     <message>
         <source>The display number of the VNC server</source>
         <translation>Numer pulpitu serwera VNC</translation>
     </message>
     <message>
         <source>Delay between requesting updates from the server</source>
         <translation>Opoznienie pomiedzy zadaniami aktualizacji z serwera</translation>
     </message>
     <message>
         <source>Request that the VNC server transfer 8 bit color</source>
         <translation>Zadaj, zeby serwer VNC transferowal 8 bitowy kolor</translation>
     </message>
     <message>
         <source>Allow other users to connect to the VNC server</source>
         <translation>Zezwalaj innym uzytkownikom na polaczenia do serwera VNC</translation>
     </message>
     <message>
         <source>Scale the remote display to fit on the PDA (Slow)</source>
         <translation>Skaluj zdalny pulpit do ekranu PDA (wolne)</translation>
     </message>
     <message>
         <source>Enable transmiting identical rectangles as references to existing data</source>
         <translation>Wlacz transmitowanie identycznych prostokatow jako odnosniki do istniejacych danych</translation>
     </message>
 </context>
 </TS>
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
@@ -1,290 +1,278 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DocTabSettings</name>
     <message>
         <source>Enable the Documents Tab</source>
         <translation>Włącz zakładkę Dokumenty</translation>
     </message>
     <message>
         <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
         <translation>&lt;b&gt;Uwaga:&lt;/b&gt; Aby te ustawienia zadziałały może być konieczny restart Opie.</translation>
     </message>
     <message>
         <source>Check, if you want the Documents Tab to be visible.</source>
         <translation>Zaznacz jeśli chcesz aby zakładka Dokumenty była widoczna.</translation>
     </message>
 </context>
 <context>
     <name>InputMethodSettings</name>
     <message>
         <source>Resize application on Popup</source>
         <translation>Zmień rozmiar okienka przy otwarciu</translation>
     </message>
     <message>
         <source>Enable floating and resizing</source>
         <translation>Włącz przesuwanie i zmianę rozmiaru</translation>
     </message>
     <message>
         <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
         <translation>&lt;b&gt;Uwaga:&lt;/b&gt; Aby te ustawienia zadziałały może być konieczny restart Opie.</translation>
     </message>
     <message>
         <source>Check, if you want the application to be automatically resized if the input method pops up.</source>
         <translation>Zaznacz jeśli chcesz aby rozmiar okienka był automatycznie zmieniony gdy otwarte jest okienko wprowadzania danych.</translation>
     </message>
     <message>
         <source>Check, if you want to move and/or resize input methods</source>
         <translation>Zaznacz jeśli chcesz przesuwać lub zmieniać rozmiar okienka wprowadzania danych</translation>
     </message>
     <message>
         <source>Specify the percentage of the screen width for the input method</source>
         <translation>Podaj procent szerokości ekranu dla okienka wprowadzania danych</translation>
     </message>
 </context>
 <context>
     <name>LauncherSettings</name>
     <message>
         <source>Launcher Settings</source>
         <translation>Ustawienia Launcher&apos;a</translation>
     </message>
     <message>
         <source>Taskbar</source>
         <translation>Pasek zadań</translation>
     </message>
     <message>
         <source>O-Menu</source>
         <translation>O-menu</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Zakładki</translation>
     </message>
     <message>
         <source>InputMethods</source>
         <translation>Wprowadzanie danych</translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation>Dokumenty</translation>
     </message>
 </context>
 <context>
     <name>MenuSettings</name>
     <message>
         <source>Load applets in O-Menu:</source>
         <translation>W O-menu ładuj applety:</translation>
     </message>
     <message>
         <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>
         <translation>Przykład 2</translation>
     </message>
     <message>
         <source>Sample 3</source>
         <translation>Przykład 3</translation>
     </message>
 </context>
 <context>
     <name>TabDialog</name>
     <message>
         <source>Edit Tab</source>
         <translation>Edytuj zakładkę</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>Tło</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Czcionka</translation>
     </message>
     <message>
         <source>Icons</source>
         <translation>Ikony</translation>
     </message>
     <message>
         <source>Previewing %1</source>
         <translation>Podgląd %1</translation>
     </message>
     <message>
         <source>This is a rough preview of what the currently selected Tab will look like.</source>
         <translation>To ogólny podgląd tego jak będzie wyglądać aktualnie wybrana zakładka.</translation>
     </message>
     <message>
         <source>Use a custom font</source>
         <translation>Użyj własnej czcionki</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Typ:</translation>
     </message>
     <message>
         <source>Ruled</source>
         <translation>Paski</translation>
     </message>
     <message>
         <source>Solid color</source>
         <translation>Jednolity kolor</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Tapeta</translation>
     </message>
     <message>
         <source>Select...</source>
         <translation>Wybierz...</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Domyślne</translation>
     </message>
     <message>
         <source>Size:</source>
         <translation>Rozmiar:</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Małe</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Duże</translation>
     </message>
     <message>
         <source>Color:</source>
         <translation>Kolor:</translation>
     </message>
     <message>
         <source>Columns:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatic</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TabsSettings</name>
     <message>
         <source>Launcher Tabs:</source>
         <translation>Zakładki Launcher&apos;a:</translation>
     </message>
     <message>
         <source>foobar</source>
         <translation>foobar</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nowa</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Edytuj</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>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>
         <source>Not implemented yet</source>
         <translation>Nie zaimplementowane</translation>
     </message>
     <message>
         <source>Enable animated busy indicator</source>
         <translation>Włącz animowany wskaźnik zajętości</translation>
     </message>
     <message>
         <source>Activate this, if you want an animatedbusy indicator for starting applications in the Launcher.</source>
         <translation>Aktywuj jeśli chcesz wyświetlać animowany wskaźnik zajętości dla startujących aplikacji.</translation>
     </message>
     <message>
         <source>Enable static background pixmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Activate this, if you want the background pixmap not to scroll with the icons.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskbarSettings</name>
     <message>
         <source>Load applets in Taskbar:</source>
         <translation>Applety do załadowania w pasku zadań:</translation>
     </message>
     <message>
         <source>Check the applets that you want displayed in the Taskbar.</source>
         <translation>Zaznacz applety, ktore mają się pokazywać w pasku zadań.</translation>
     </message>
 </context>
 </TS>
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,114 +1,86 @@
 <!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>
         <source>Very Low</source>
         <translation>Bardzo niski</translation>
     </message>
     <message>
         <source>Critical</source>
         <translation>Krytyczny</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Nieznany</translation>
     </message>
     <message>
         <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>
         <source>Remaing Power: %1 %2
 Remaining Time: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ipaq  %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,1142 +1,727 @@
 <!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>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished">Tydzień</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished">Miesiąc</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished">Rok</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished">Co:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished">Częstotliwość</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished">Koniec:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">Bez daty końcowej</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">Powtarzaj używając</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">Pon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">Wto</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">Śro</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">Czw</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">Pią</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">Sob</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">Nie</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">Co</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">Bez daty końcowej</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished">dni</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished">dzień</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished">tygodni</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished">tydzień</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished">miesięcy</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished">miesiąc</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished">lat</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished">rok</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished">i</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished">,
 i</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished">, i</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished">używając</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished">Bez powtarzania</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished">dzień (dni)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">Powtarzaj używając</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">Pon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">Wto</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">Śro</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">Czw</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">Pią</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">Sob</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">Nie</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished">tydzień(dnie)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished">Powtarzaj co</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">Dzień</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Data</translation>
     </message>
     <message>
         <source>month(s)</source>
         <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>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to edit the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to duplicate the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to delete the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to transmit the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</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">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>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategoria:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation>Domyślny e-mail:</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Biuro:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>WWW firma:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Tel. firma:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Fax firma:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Tel. kom. firma:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Pager firma:</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Strona domowa:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Tel. dom:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Fax dom:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Tel. kom. dom:</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation>Adresy e-mail:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Zawód:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Asystent:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Menadżer:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Mężczyzna</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Kobieta</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Płeć:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Partner:</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Urodziny:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Rocznica:</translation>
     </message>
     <message>
         <source>Children: </source>
         <translation>Dzieci:</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Przydomek:</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notatki:</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation>Początek:</translation>
     </message>
     <message>
         <source>End:</source>
         <translation>Koniec:</translation>
     </message>
     <message>
         <source>Note:</source>
         <translation>Notatka:</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Co</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 każdego</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>%1 każdego</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Co</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Poniedziałek</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Wtorek</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Środa</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Czwartek</translation>
     </message>
     <message>
         <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>
         <source>Low</source>
         <translation>Niski</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation>Bardzo niski</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Lokacja:</translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation>Zdarzenie 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>
         <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;br&gt;&lt;b&gt;Adres domowy:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>User Id</source>
         <translation>ID użytkownika</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Tytuł</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Imię</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Drugie imię</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Nazwisko</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Przyrostek</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Zapisz jako</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Tytuł służbowy</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Dział</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Firma</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Tel. firma</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Fax firma</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Tel. kom. firma</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>Domyślny e-mail</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>Adresy e-mail</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Tel. dom</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Fax dom</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Tel. kom. dom</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Ulica firma</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Miasto firma</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>Region firma</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>Kod poczt. firma</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>Kraj firma</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Pager firma</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>WWW firma</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Biuro</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Zawód</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Asystent</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Menadżer</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Ulica dom</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Miasto dom</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>Region dom</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>Kod poczt. dom</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>Kraj dom</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Strona domowa</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Partner</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Płeć</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Urodziny</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Rocznica</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Przydomek</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Dzieci</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notatki</translation>
     </message>
     <message>
         <source>Has a due-date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No due-date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No reccurrence</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No start-date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No completed-date</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>nd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>rd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>th</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/libopieui2.ts b/i18n/pl/libopieui2.ts
index 4c01222..161e8f9 100644
--- a/i18n/pl/libopieui2.ts
+++ b/i18n/pl/libopieui2.ts
@@ -1,978 +1,175 @@
 <!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>
     </message>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished">Nazwa</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished">Rozmiar</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Data</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished">Typ Mime</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished">Plik</translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished">Otwórz</translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished">Zapisz</translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished">Nazwa:</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation type="unfinished">Styl</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished">Rozmiar</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="unfinished">Nazwa</translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished"></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="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>
 </TS>
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
@@ -1,1036 +1,994 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation>Wszystkie</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Nieprzydzielone</translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation>(kilka)</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Służbowe</translation>
     </message>
     <message>
         <source>Personal</source>
         <translation>Osobiste</translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation>(Kilka)</translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation>Wszystkie</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>Nowa kategoria</translation>
     </message>
     <message>
         <source>New Category </source>
         <translation>Nowa kategoria </translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation>Edycja kategorii</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Application</source>
         <translation>Aplikacja</translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation>Tu są kategorie</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Dodaj</translation>
     </message>
     <message>
         <source>Global</source>
         <translation>Globalne</translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation>Zaznacz kategorie, do których należy ten dokument.</translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation>Wpisz tu nową kategorię. Wciśnij &lt;b&gt;Dodaj&lt;/b&gt; by dodać ją do listy.</translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation>Wpisz nową kategorię po lewej i wciśnij by ją dodać do listy.</translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation>Wciśnij by usunąć podświetloną kategorię.</translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation>Zaznacz aby udostępnić tą właściwość wszystkim aplikacjom.</translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation>Wszystkie</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Nieprzydzielone</translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation>Przepraszam, inna aplikacja
 edytuje kategorie.</translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation>Edytuj kategorie</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Wszystkie</translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation>Pokaż Styczeń wybranego roku</translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation>Pokaż poprzedni miesiąc</translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation>Pokaż następny miesiąc</translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation>Pokaż Grudzień wybranego roku</translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation>Zamknij wybór plików</translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation>Pokaż dokumenty tego pliku</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Widok dokumentu</translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation>Pokaż dokumenty tej kategorii</translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation>Kliknij aby wybrać dokument z listy</translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation>, albo wybierz &lt;b&gt;Nowy dokument&lt;/b&gt; aby stworzyć nowy dokument.</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation>&lt;br&gt;&lt;br&gt;Kliknij i przytrzymaj by zobaczyć właściwości dokumentu.</translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <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>
         <source>Find what:</source>
         <translation>Czego szukać:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategoria:</translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation>Zacznij szukać od:</translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation>Gru 02 01</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Rozróżniaj wielkość liter</translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation>Szukaj wstecz</translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Document View</source>
         <translation>Widok dokumentu</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Usuń</translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation>Usunięcie pliku nie udało się.</translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation>Kopia</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplikat</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>Skopiowanie pliku nie udało się.</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Szczegóły</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>Przeniesienie pliku nie udało się.</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Dysk twardy</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Właściwości</translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation>Szczegóły</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>Komentarz:</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Typ:</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nazwa:</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Lokalizacja:</translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation>Szybkie ładowanie (zajmuje pamięć)</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Usuń</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Kopiuj</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Emituj</translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation>Nośnik, na którym znajduje się dokument.</translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation>Nazwa tego dokumentu.</translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation>Ładuj aplikację do pamięci by była szybko dostępna.</translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation>Usuń ten dokument.</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation>Twórz kopię tego dokumentu.</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation>Emituj ten dokument do innego urządzenia.</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation>Używaj rotacji użytkownika</translation>
     </message>
     <message>
         <source>Arguments:</source>
         <translation>Argumenty:</translation>
     </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>Informacje o właścicielu</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Podaj hasło</translation>
     </message>
 </context>
 <context>
     <name>QMessageBox</name>
     <message>
         <source>Yes</source>
         <translation>Tak</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nie</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Brak miejsca</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>Jest problem z utworzeniem
 Informacji Konfiguracyjnych
 dla tego programu.
 
 Zwolnij więcej pamięci i
 spróbuj ponownie.</translation>
     </message>
     <message>
         <source>Unable to create start up files
 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>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Adres domowy:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation>Adres e-mail: </translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Tel. dom: </translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Faks dom: </translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Tel. kom. dom: </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>WWW dom: </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>WWW firma:</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Biuro: </translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Tel. firma: </translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Faks firma: </translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Tel. kom. firma: </translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Pager firma: </translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Zawód: </translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Asystent:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Menadźer: </translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Mężczyzna</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Kobieta</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Płeć: </translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Partner:</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Urodziny: </translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Pocznica:</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Pseudonim: </translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Tytuł</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Imię</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Drugie imię</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Nazwisko</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Przyrostek</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Zapisz jako</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Tytuł służbowy</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Wydział</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Firma</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Tel. firma</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Faks firma</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Tel. kom. firma</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>Domyślny e-mail</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>Adresy e-mail</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Tel. dom</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Faks dom</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Tel. kom. dom</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Ulica firma</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Miasto firma</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>Region firma</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>Kod poczt. firma</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>Kraj firma</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Pager firma</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>WWW firma</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Biuro</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Zawód</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Asystent</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Menadżer</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Ulica dom</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Miasto dom</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>Region dom</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>Kod poczt. dom</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>Kraj dom</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>WWW dom</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Partner</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Płeć</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Urodziny</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Rocznica</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Pseudonim</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Dzieci</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notatki</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Grupy</translation>
     </message>
     <message>
         <source>New Document</source>
         <translation>Nowy dokument</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Pon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Wto</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Śro</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Czw</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <source>Jan</source>
         <translation>Sty</translation>
     </message>
     <message>
         <source>Feb</source>
         <translation>Lut</translation>
     </message>
     <message>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
         <source>Apr</source>
         <translation>Kwi</translation>
     </message>
     <message>
         <source>May</source>
         <translation>Maj</translation>
     </message>
     <message>
         <source>Jun</source>
         <translation>Cze</translation>
     </message>
     <message>
         <source>Jul</source>
         <translation>Lip</translation>
     </message>
     <message>
         <source>Aug</source>
         <translation>Sie</translation>
     </message>
     <message>
         <source>Sep</source>
         <translation>Wrz</translation>
     </message>
     <message>
         <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>
     <message>
         <source>%1 document</source>
         <translation>dokument %1</translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation>Kliknij aby zamknąć to okno porzucając zmiany.</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation>Kliknij aby zamknąć to okno.</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation>Kliknij aby zamknąć to okno akceptując zmiany.</translation>
     </message>
     <message>
         <source>Click to make this window movable.</source>
         <translation>Kliknij aby to okno było przesuwalne.</translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
         <translation>Kliknij aby rozszerzyć okno na całą dostępną przestrzeń.</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation>Przywróć</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>Przesuń</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Rozmiar</translation>
     </message>
     <message>
         <source>Maximize</source>
         <translation>Maksymalizuj</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Zamknij</translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>Karta CF</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Dysk twardy</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>Karta SD</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>Dysk twardy SCSI</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Nośnik wewnętrzny</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>Pamięć wewnętrzna</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>Karta MMC</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>Brak</translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation>nie znaleziono programu citytime</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation>Aby móc wybierać strefy czasowe
 zainstaluj program citytime.</translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Brak miejsca</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Nie mogę ustawić alarmu.
 Zwolnij więcej miejsca w pamięci 
 i spróbuj ponownie</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>%1 plików</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>%1 %2</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>Wszystkie %1 plików</translation>
     </message>
     <message>
         <source>All files</source>
         <translation>Wszystkie pliki</translation>
     </message>
 </context>
 <context>
     <name>WindowDecoration</name>
     <message>
         <source>Default</source>
         <comment>List box text for default window decoration</comment>
         <translation>Domyślne</translation>
     </message>
 </context>
 </TS>
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,114 +1,102 @@
 <!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>
         <source>Colors for the headlines !</source>
         <translation>Kolory nagłówków!</translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
         <translation>Kolor wpisu:</translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation>Ten kolor będzie użyty dle wyświetlonych urodzin/rocznic!</translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation>Ustaw jako pilne
 jeśli bliżej niż</translation>
     </message>
     <message>
         <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>
         <source>The next birthdays will just be shown, if enabled!</source>
         <translation>Jeśli włączone, to wyświetlane będą nadchodzące urodziny!</translation>
     </message>
     <message>
         <source>The next anniversaries will just be shown, if enabled !</source>
         <translation>Jeśli włączone, to wyświetlane będą nadchodzące rocznice!</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>AddressBook plugin</source>
         <translation>Plugin Książka Adresowa</translation>
     </message>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>Urodziny w ciągu najbliższych &lt;b&gt; %1 &lt;/b&gt; dni:</translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>Brak urodzin w ciągu najbliższych &lt;b&gt; %1 &lt;/b&gt; dni!</translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>Rocznice w ciągu najbliższych &lt;b&gt; %1 &lt;/b&gt; dni:</translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>Brak rocznic w ciągu najbliższych &lt;b&gt; %1 &lt;/b&gt; dni!</translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation>Baza danych nie dostarcza tego zapytania! Zaktualizuj libOpie!&lt;br&gt;</translation>
     </message>
 </context>
 </TS>
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
@@ -1,120 +1,116 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>Weather plugin</source>
         <translation>Wtyczka Pogoda</translation>
     </message>
 </context>
 <context>
     <name>WeatherPluginConfig</name>
     <message>
         <source>Enter ICAO location identifier:</source>
         <translation>Wpisz identyfikator lokalizacji ICAO:</translation>
     </message>
     <message>
         <source>Enter the 4 letter code for the desired location here.  See http://www.nws.noaa.gov/tg/siteloc.shtml to find a location near you.</source>
         <translation>Wpisz tu czteroliterowy kod żądanej lokalizacji. Sprawdź http://www.nws.noaa.gov/tg/siteloc.shtml by znaleźć najbliższą ci lokalizację.</translation>
     </message>
     <message>
         <source>Visit http://www.nws.noaa.gov/tg/siteloc.shtml to find the nearest location.</source>
         <translation>Odwiedź http://www.nws.noaa.gov/tg/siteloc.shtml by znaleźć najbliższą lokalizację.</translation>
     </message>
     <message>
         <source>Use metric units</source>
         <translation>Używaj jednostek metrycznych</translation>
     </message>
     <message>
         <source>Click here to select type of units displayed.</source>
         <translation>Kliknij tu aby wybrać typ wyświetlanych jednostek.</translation>
     </message>
     <message>
         <source>Update frequency (in minutes):</source>
         <translation>Czestotliwość aktualizacji (w minutach):</translation>
     </message>
     <message>
         <source>Select how often (in minutes) you want the weather to be updated.</source>
         <translation>Określ jak często (w minutach) aktualizowana ma być informacja o pogodzie.</translation>
     </message>
 </context>
 <context>
     <name>WeatherPluginWidget</name>
     <message>
         <source>Retreiving current weather information.</source>
         <translation>Pobieram aktualne informacje o pogodzie.</translation>
     </message>
     <message>
         <source>Temp: </source>
         <translation>Temp:</translation>
     </message>
     <message>
         <source>  Wind: </source>
         <translation>Wiatr:</translation>
     </message>
     <message>
         <source>
 Pres: </source>
         <translation>Ciśn:</translation>
     </message>
     <message>
         <source>Current weather data not available.</source>
         <translation>Aktualne dane o pogodzie niedostępne.</translation>
     </message>
     <message>
         <source>n/a</source>
         <translation>brak</translation>
     </message>
     <message>
         <source>E </source>
         <translation>E</translation>
     </message>
     <message>
         <source>NE </source>
         <translation>NE</translation>
     </message>
     <message>
         <source>N </source>
         <translation>N</translation>
     </message>
     <message>
         <source>NW </source>
         <translation>NW</translation>
     </message>
     <message>
         <source>W </source>
         <translation>W</translation>
     </message>
     <message>
         <source>SW </source>
         <translation>SW</translation>
     </message>
     <message>
         <source>S </source>
         <translation>S</translation>
     </message>
     <message>
         <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
@@ -1,40 +1,36 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MindBreaker</name>
     <message>
         <source>New Game</source>
         <translation>Nowa gra</translation>
     </message>
     <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>
         <source>Cancel</source>
         <translation>Wroc</translation>
     </message>
 </context>
 </TS>
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,37 +1,33 @@
 <!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>
         <source>Game</source>
         <translation>Gra</translation>
     </message>
     <message>
         <source>Mine Sweep</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -410,523 +410,503 @@
     <message>
         <source>Device</source>
         <translation>Urzadzenie</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Configure Profiles</source>
         <translation>Konfiguruj profile</translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation>Nowe polaczenie</translation>
     </message>
     <message>
         <source>Save Connection</source>
         <translation>Zapisz polaczenie</translation>
     </message>
     <message>
         <source>Connect</source>
         <translation>Polacz</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>Rozlacz</translation>
     </message>
     <message>
         <source>QuickLaunch</source>
         <translation>SzybkiStart</translation>
     </message>
     <message>
         <source>The shell button launches the &quot;default&quot; profile. If there is none default values are taken</source>
         <translation>Przycisk powloki uruchamia &quot;domyslny&quot; profil. Jesli nie ma zadnego przyjmowane sa domyslne wartosci</translation>
     </message>
     <message>
         <source>Transfer file...</source>
         <translation>Transfer pliku...</translation>
     </message>
     <message>
         <source>Line wrap</source>
         <translation>Zawijanie linii</translation>
     </message>
     <message>
         <source>Full screen</source>
         <translation>Pelny ekran</translation>
     </message>
     <message>
         <source>Save history</source>
         <translation>Zapisz historie</translation>
     </message>
     <message>
         <source>Terminate</source>
         <translation>Zabij</translation>
     </message>
     <message>
         <source>Close Window</source>
         <translation>Zamknij okno</translation>
     </message>
     <message>
         <source>Run Script</source>
         <translation>Uruchom skrypt</translation>
     </message>
     <message>
         <source>Record Script</source>
         <translation>Nagraj skrypt</translation>
     </message>
     <message>
         <source>Save Script</source>
         <translation>Zapisz skrypt</translation>
     </message>
     <message>
         <source>Open Keyboard...</source>
         <translation>Otworz klawiature...</translation>
     </message>
     <message>
         <source>New from Profile</source>
         <translation>Nowy z Profilu</translation>
     </message>
     <message>
         <source>Connection</source>
         <translation>Polaczenie</translation>
     </message>
     <message>
         <source>Scripts</source>
         <translation>Skrypty</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Kopiuj</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Wklej</translation>
     </message>
     <message>
         <source>Script</source>
         <translation>Skrypt</translation>
     </message>
     <message>
         <source>&lt;qt&gt;There is no Connection.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Nie ma polaczenia.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>History</source>
         <translation>Historia</translation>
     </message>
     <message>
         <source>New Profile</source>
         <translation>Nowy profil</translation>
     </message>
     <message>
         <source>Save Profile</source>
         <translation>Zapisz profil</translation>
     </message>
     <message>
         <source>Start log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Log</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModemConfigWidget</name>
     <message>
         <source>Modem is attached to:</source>
         <translation>Modem jest podlaczony do:</translation>
     </message>
     <message>
         <source>Enter telefon number here:</source>
         <translation>Wpisz tu domyslny numer telefonu:</translation>
     </message>
     <message>
         <source>AT commands</source>
         <translation>Polecenia AT</translation>
     </message>
     <message>
         <source>Enter number</source>
         <translation>Wpisz numer</translation>
     </message>
 </context>
 <context>
     <name>NoOptions</name>
     <message>
         <source>This Plugin does not support any configurations</source>
         <translation>Ta Wtyczka nie obsluguje zadnej konfiguracji</translation>
     </message>
 </context>
 <context>
     <name>ProfileEditorDialog</name>
     <message>
         <source>Connection</source>
         <translation>Polaczenie</translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
         <source>Auto connect after load</source>
         <translation>Polacz automatycznie po zaladowaniu</translation>
     </message>
     <message>
         <source>Local Console</source>
         <translation>Lokalna konsola</translation>
     </message>
     <message>
         <source>New Profile</source>
         <translation>Nowy profil</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Opie Console</source>
         <translation>Konsola Opie</translation>
     </message>
     <message>
         <source>Failed</source>
         <translation>Porazka</translation>
     </message>
     <message>
         <source>Connecting failed for this session.</source>
         <translation>Polaczenie dla tej sesji nie udalo sie.</translation>
     </message>
     <message>
         <source>Session failed</source>
         <translation>Sesja sie nie powiodla</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Cannot open session: Not all components were found.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Nie mozna otworzyc sesji: Nie znaleziono wszystkich komponentow.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Transfer mode</source>
         <translation>Tryb transferu</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Wyslij</translation>
     </message>
     <message>
         <source>Receive</source>
         <translation>Odbierz</translation>
     </message>
     <message>
         <source>Send file</source>
         <translation>Wyslij plik</translation>
     </message>
     <message>
         <source>Transfer protocol</source>
         <translation>Protokol transferu</translation>
     </message>
     <message>
         <source>Progress</source>
         <translation>Postep</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
         <source>Ready</source>
         <translation>Gotowy</translation>
     </message>
     <message>
         <source>Start transfer</source>
         <translation>Rozpocznij transfer</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
     <message>
         <source>File transfer</source>
         <translation>Transfer pliku</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation>Uwaga</translation>
     </message>
     <message>
         <source>No file has been specified.</source>
         <translation>Nie zostal okreslony zaden plik.</translation>
     </message>
     <message>
         <source>Sending...</source>
         <translation>Wysylanie...</translation>
     </message>
     <message>
         <source>Receiving...</source>
         <translation>Odbieranie...</translation>
     </message>
     <message>
         <source>Cancelled</source>
         <translation>Anulowany</translation>
     </message>
     <message>
         <source>The file transfer has been cancelled.</source>
         <translation>Transfer pliku zostal anulowany.</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Blad</translation>
     </message>
     <message>
         <source>Operation not supported.</source>
         <translation>Operacja nie obslugiwana.</translation>
     </message>
     <message>
         <source>Transfer could not be started.</source>
         <translation>Transfer nie mogl byc rozpoczety.</translation>
     </message>
     <message>
         <source>No error.</source>
         <translation>Brak bledu.</translation>
     </message>
     <message>
         <source>Undefined error occured.</source>
         <translation>Wystapil niezdefiniowany blad.</translation>
     </message>
     <message>
         <source>Incomplete transfer.</source>
         <translation>Niekompletny transfer.</translation>
     </message>
     <message>
         <source>Unknown error occured.</source>
         <translation>Wystapil nieznany blad.</translation>
     </message>
     <message>
         <source>Sent</source>
         <translation>Wyslany</translation>
     </message>
     <message>
         <source>File has been sent.</source>
         <translation>Plik zostal wyslany.</translation>
     </message>
     <message>
         <source>Received</source>
         <translation>Odebrany</translation>
     </message>
     <message>
         <source>File has been received.</source>
         <translation>Plik zostal odebrany.</translation>
     </message>
     <message>
         <source>Profile name</source>
         <translation>Nazwa profilu</translation>
     </message>
     <message>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
         <source>Connection</source>
         <translation>Polaczenie</translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
         <source>Special Keys</source>
         <translation>Klawisze specjalne</translation>
     </message>
     <message>
         <source>Invalid profile</source>
         <translation>Nieprawidlowy profil</translation>
     </message>
     <message>
         <source>Please enter a profile name.</source>
         <translation>Podaj nazwe profilu.</translation>
     </message>
     <message>
         <source>Z-Modem</source>
         <translation>Z-Modem</translation>
     </message>
     <message>
         <source>Y-Modem</source>
         <translation>Y-Modem</translation>
     </message>
     <message>
         <source>X-Modem</source>
         <translation>X-Modem</translation>
     </message>
     <message>
         <source>Serial</source>
         <translation>Szeregowy</translation>
     </message>
     <message>
         <source>Modem</source>
         <translation>Modem</translation>
     </message>
     <message>
         <source>Local Console</source>
         <translation>Lokalna konsola</translation>
     </message>
     <message>
         <source>Default Terminal</source>
         <translation>Domyslny terminal</translation>
     </message>
     <message>
         <source>Default Keyboard</source>
         <translation>Domyslna klawiatura</translation>
     </message>
     <message>
         <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>
         <source>Reset speakers</source>
         <translation>Zeruj glosniki</translation>
     </message>
     <message>
         <source>Turning off dialtone</source>
         <translation>Wylaczanie dzwieku dzwonienia</translation>
     </message>
     <message>
         <source>Dial number</source>
         <translation>Wybierz numer</translation>
     </message>
     <message>
         <source>Line busy, redialing number</source>
         <translation>Linia zajeta, ponowne wybieranie</translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation>Polaczenie nawiazane</translation>
     </message>
     <message>
         <source>Dismiss</source>
         <translation>Rozlacz</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Dialing the number failed.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fixing up Embedix</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SerialConfigWidget</name>
     <message>
         <source>Device</source>
         <translation>Urzadzenie</translation>
     </message>
 </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>
         <source>Options</source>
         <translation>Opcje</translation>
     </message>
     <message>
         <source>Local echo</source>
         <translation>Lokalne echo</translation>
     </message>
     <message>
         <source>Line wrap</source>
         <translation>Zawijanie linii</translation>
     </message>
     <message>
         <source>VT 100</source>
         <translation>VT 100</translation>
     </message>
     <message>
         <source>VT 102</source>
         <translation>VT 102</translation>
     </message>
     <message>
         <source>Linux Console</source>
         <translation>Konsola Linuksowa</translation>
     </message>
     <message>
         <source>X-Terminal</source>
         <translation>X-Terminal</translation>
     </message>
     <message>
         <source>black on white</source>
         <translation>czarny na bialym</translation>
     </message>
     <message>
         <source>white on black</source>
         <translation>bialy na czarnym</translation>
     </message>
     <message>
         <source>green on black</source>
         <translation>zielony na czarnym</translation>
     </message>
     <message>
         <source>orange on black</source>
         <translation>pomaranczowy na czarnym</translation>
     </message>
 </context>
 </TS>
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
@@ -1,300 +1,328 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BaseSetup</name>
     <message>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slideshow timeout:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Toggle autoscale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to next image</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Delete Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Image Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></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>Browser Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Keyboard Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie Eye - Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Imageinfo Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Imageview Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Go dir up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start slideshow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and Imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show images fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto rotate images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show images unscaled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show zoomer window when unscaled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
     <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>
         <source>&lt;center&gt;&lt;b&gt;Be carefull with the following options!&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show files recursive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recursion depth:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Digital Camera View</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Name Only</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>imageinfo</name>
     <message>
         <source>View Full Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays an thumbnail of the image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays info of selected image</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,134 +1,126 @@
 <!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>
         <source>User</source>
         <translation>Uzytkownik</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Haslo</translation>
     </message>
     <message>
         <source>Suspend</source>
         <translation>Uspij</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Menu</translation>
     </message>
 </context>
 <context>
     <name>LoginWindowImpl</name>
     <message>
         <source>Restart</source>
         <translation>Restart</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>Wyjdz</translation>
     </message>
     <message>
-        <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
-        <translation type="obsolete">&lt;center&gt;%1 %2&lt;/center&gt;</translation>
-    </message>
-    <message>
         <source>Wrong password</source>
         <translation>Zle haslo</translation>
     </message>
     <message>
         <source>The given password is incorrect.</source>
         <translation>Podane haslo jest nieprawidlowe.</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Porazka</translation>
     </message>
     <message>
         <source>Could not switch to new user identity</source>
         <translation>Nie mozna przelaczyc na nowego uzytkownika</translation>
     </message>
     <message>
         <source>Opie was terminated
 by an uncaught signal
 (%1)
 </source>
         <translation>Opie zostalo zamkniete
 przez nieprzechwycony sygnal
 (%1)
 </translation>
     </message>
     <message>
         <source>Could not start Opie.</source>
         <translation>Nie mozna uruchomic Opie.</translation>
     </message>
 </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>
     <message>
         <source>&lt;b&gt;Password:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Confirm:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PasswordDialogImpl</name>
     <message>
         <source>Trying to leave without password set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;No password was set. This could lead to you not beeingable to remotely connect to your machine.Do you want to continue not setting a password?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passwords don&apos;t match</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The two passwords don&apos;t match. Please try again.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password not legal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The entered password is not a valid password.Please try entering a valid password.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,817 +1,878 @@
 <!DOCTYPE TS><TS>
 <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>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerUI</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposeMail</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please create an SMTP account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a File.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Store message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Store message into drafts?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Attachments will not be stored in &quot;Draft&quot; folder&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Receiver specified</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposeMailUI</name>
     <message>
         <source>Compose Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>send later</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>use:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BCC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <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>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>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete the selected Account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select an account.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccountsUI</name>
     <message>
         <source>Configure Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>News</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IMAPconfigUI</name>
     <message>
         <source>Configure IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefix</source>
         <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>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>
     </message>
     <message>
         <source>Send queued mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show/Hide folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Newsgroups</source>
         <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>
     </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>
 <context>
     <name>NNTPconfigUI</name>
     <message>
         <source>Configure NNTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Newsgroup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get newsgroup list from server</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Newmdirdlgui</name>
     <message>
         <source>Enter directory name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directory name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directory contains other subdirs</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <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>
     </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>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></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>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec imapd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>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>
     </message>
     <message>
         <source>Use Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the SMTP Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port of the SMTP Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SelectMailTypeUI</name>
     <message>
         <source>Select Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Account Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>POP3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SMTP</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SettingsDialogUI</name>
     <message>
         <source>Settings Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View mail as Html</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compose Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mails later ( enqueue in outbox )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></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>
     </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>
     </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>
     </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>
     </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>
     </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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Store mail(s) to&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Folder:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create new folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefix will prepend, no need to enter it!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move mail(s)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,151 +1,131 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <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>
         <source>Options</source>
         <translation>Opcje</translation>
     </message>
     <message>
         <source>Enter your search terms here</source>
         <translation>Wpisz tu wyszukiwany ciąg</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Aplikacje</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Dokumenty</translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation>Lista ZróbTo</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Kalendarz</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Kontakty</translation>
     </message>
     <message>
         <source>Search for: </source>
         <translation>Szukaj: </translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case sensitive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OListView</name>
     <message>
         <source>Results</source>
         <translation>Wyniki</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>show</source>
         <translation>pokaż</translation>
     </message>
     <message>
         <source>edit</source>
         <translation>edytuj</translation>
     </message>
     <message>
         <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>
         <source>Search in dates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search content</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,97 +1,73 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CanvasCardWindow</name>
     <message>
         <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>
         <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>
         <source>Snap to position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Turn one card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Turn three cards</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,452 +1,418 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation>Język</translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation>Czas i data</translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation>Informacje osobiste</translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation>Dokumenty</translation>
     </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation>Problem z aplikacją</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation>&lt;p&gt;%1 nie odpowiada.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Czy chcesz wymusić zakończenie aplikacji?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;p&gt;Szybkie ładowanie tej aplikacji zostało wyłączone. Kliknij i przytrzymaj na ikonie aplikacji by je ponownie włączyć.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; został zamknięty po otrzymaniu sygnału %2&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation>Aplikacja zamknieta</translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation>Aplikacja nie znaleziona</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Nie można zlokalizować aplikacji &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Nie można znaleźć aplikacji %1&lt;/qt&gt;</translation>
     </message>
     <message>
         <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>
 <context>
     <name>FirstUse</name>
     <message>
         <source>&lt;&lt; Back</source>
         <translation>&lt;&lt; Wstecz</translation>
     </message>
     <message>
         <source>Next &gt;&gt;</source>
         <translation>Dalej &gt;&gt;</translation>
     </message>
     <message>
         <source>Tap anywhere on the screen to continue.</source>
         <translation>Kliknij gdziekolwiek na ekranie by kontynuować.</translation>
     </message>
     <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>
         <translation>Launcher</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation>- Launcher</translation>
     </message>
     <message>
         <source>No application</source>
         <translation>Brak aplikacji</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;Brak aplikacji zdefiniowanych dla tego dokumentu.&lt;p&gt; Typ to %1.</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Dokumenty</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>View as text</source>
         <translation>Pokaż jako tekst</translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation>&lt;b&gt;Wyszukiwanie Dokumentów...&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation>Pokazuj ikony</translation>
     </message>
     <message>
         <source>List View</source>
         <translation>Pokazuj listę</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;Zakładka Dokumenty&lt;p&gt;została wyłączona.&lt;p&gt;Aby ją ponownie włączyć wejdź w Ustawienia-&gt;Launcher-&gt;Dokumenty&lt;/b&gt;&lt;/center&gt;</translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>Document View</source>
         <translation>Widok Dokumentu</translation>
     </message>
     <message>
         <source>All types</source>
         <translation>Wszystkie typy</translation>
     </message>
 </context>
 <context>
     <name>Mediadlg</name>
     <message>
         <source>A new storage media detected:</source>
         <translation>Wykryto nowy nośnik danych:</translation>
     </message>
     <message>
         <source>What should I do with it?</source>
         <translation>Co z nim zrobić?</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>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scan whole media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation type="unfinished"></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>Tryb bezpieczny</translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation>Menedżer wtyczek...</translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation>Restartuj Qtopia</translation>
     </message>
     <message>
         <source>Help...</source>
         <translation>Pomoc...</translation>
     </message>
 </context>
 <context>
     <name>Server</name>
     <message>
         <source>USB Lock</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <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>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation>Menedżer wtyczek...</translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation>Stan pamięci</translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation>Mało pamięci
 Zapisz dane.</translation>
     </message>
     <message>
         <source>Critical Memory Shortage
 Please end this application
 immediately.</source>
         <translation>Krytyczny brak pamięci
 Zakończ natychmiast 
 tą aplikację.</translation>
     </message>
     <message>
         <source>WARNING</source>
         <translation>OSTRZEŻENIE</translation>
     </message>
     <message>
         <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
         <translation>&lt;p&gt;Poziom naładowania baterii jest krytyczny!&lt;p&gt;Wyłącz urządzenie do czasu podłączenia do sieci</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>The battery is running very low. </source>
         <translation>Poziom naładowania baterii jest bardzo niski.</translation>
     </message>
     <message>
         <source>&lt;p&gt;The Back-up battery is very low&lt;p&gt;Please charge the back-up battery</source>
         <translation>&lt;p&gt;Poziom naładowania baterii zapasowej jest bardzo niski&lt;p&gt;Naładuj ją</translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation>Zamknij</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation>Zamknij Opie</translation>
     </message>
     <message>
         <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>
         <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;Nieautoryzowany system żąda dostępu do tego urządzenia.&lt;p&gt;Jeśli używasz Qtopia Desktop w wersji starszej niż 1.5.1, to zaktualizuj ją albo zmień ustawienia na korzystanie z 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;Nieautoryzowany system żąda dostępu do tego urządzenia.&lt;p&gt;Wybrałeś IntelliSync więc możesz zezwolić na połączenie albo go odmówić.&lt;/qt&gt;</translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Abort</source>
         <translation>Przerwij</translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation>Synchronizacja:</translation>
     </message>
 </context>
 </TS>
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
@@ -1,560 +1,266 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoginBase</name>
     <message>
         <source>LoginBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login</source>
         <translation type="unfinished">Login</translation>
     </message>
     <message>
         <source>Login Automatically</source>
         <translation type="unfinished">Loguj automatycznie</translation>
     </message>
     <message>
         <source>If you select this option, opie-login will automagically log you in with the user you have selected in the drop-down list.  
 
 For the Zaurus 5x00 this is always the user &quot;root&quot;.</source>
         <translation type="unfinished">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="unfinished">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>
 </context>
 <context>
     <name>MultiauthConfig</name>
     <message>
         <source>Security configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the order they will appear in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
         <source>Locking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></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-securityplugin-*&lt;/em&gt; package! Once you have done that, you will be able to configure your PDA protection here.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MultiauthGeneralConfig</name>
     <message>
         <source>When to lock Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on Opie start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on Opie resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Multiple plugins authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Required successes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Don&apos;t protect this config screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show explanatory screens</source>
         <translation type="unfinished"></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>
         <source>Attention</source>
         <translation type="unfinished">Uwaga</translation>
     </message>
     <message>
         <source>You must save your current settings before trying to authenticate. Press OK to accept and launch a simulated authentication process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you don&apos;t like the result of this test, don&apos;t forget to change your settings before you exit the configuration application!</source>
         <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>
     </message>
     <message>
         <source>Select a net-range or enter a new one.  
 
 This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
 
 For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
 
 The entry &quot;All&quot; will allow *any* IP to connect. 
 The entry &quot;None&quot; will *deny* any connection.  
 
 If unsure, select &quot;Any&quot;.</source>
         <translation type="unfinished">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="unfinished">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="unfinished">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="unfinished">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="unfinished">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="unfinished">Wybierz oprogramowanie do synchronizacji</translation>
     </message>
     <message>
         <source>Qtopia 1.7</source>
         <translation type="unfinished">Qtopia 1.7</translation>
     </message>
     <message>
         <source>Opie 1.0</source>
         <translation type="unfinished">Opie 1.0</translation>
     </message>
     <message>
         <source>IntelliSync</source>
         <translation type="unfinished">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 type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,51 +1,43 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>SnakeGame</name>
     <message>
         <source>Snake</source>
         <translation>Waz</translation>
     </message>
     <message>
         <source>New Game</source>
         <translation>Nowa gra</translation>
     </message>
     <message>
         <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
@@ -1,389 +1,357 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tests</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error</source>
         <translation type="unfinished"></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>Ten wykres reprezentuje aktualne uzycie pamieci na tej karcie Compact Flash.</translation>
     </message>
     <message>
         <source>Ha</source>
         <translation>Ha</translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation>Ten wykres reprezentuje aktualne uzycie pamieci na tym twardym dysku.</translation>
     </message>
     <message>
         <source>SD</source>
         <translation>SD</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation>Ten wykres reprezentuje aktualne uzycie pamieci na tej karcie Secure Digital.</translation>
     </message>
     <message>
         <source>SC</source>
         <translation>SC</translation>
     </message>
     <message>
         <source>In</source>
         <translation type="unfinished">In</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation>Ten wykres reprezentuje aktualne uzycie pamieci w pamieci wbudowanej tego urzadzenia (np. pamieci Flash).</translation>
     </message>
     <message>
         <source>RA</source>
         <translation>RA</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation>Ten wykres reprezentuje aktualne uzycie pamieci na tymczasowym RAM-dysku.</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Uzycie procesora przez aplikacje (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>Uzycie procesora przez system (%)</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Typ:</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Ta strona prezentuje obciazenie procesora tego urzadzenia.</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Uzywana (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Bufory (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Podreczna (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Wolna (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Calkowita Pamiec: %1 kB</translation>
     </message>
     <message>
-        <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
-Memory is categorized as follows:
-
-1. Used - memory used to by Opie and any running applications.
-2. Buffers - temporary storage used to improve performance
-3. Cached - information that has recently been used, but has not been freed yet.
-4. Free - memory not currently used by Opie or any running applications.</source>
-        <translation type="obsolete">Ta strona prezentuje alokacje pamieci (np. RAM) na Twoim urzadzeniu.
-Pamiec jest podzielona na kategorie:
-
-1. Uzywana - pamiec uzywana przez Opie i inne dzialajace aplikacje.
-2. Bufory - tymczasowa przestrzen uzywana do poprawienia wydajnosci.
-3. Podreczna - informacje, ktore zostaly juz uzyte, ale nie zostaly jeszcze zwolnione.
-4. Wolna - pamiec nie bedaca aktualnie w uzyciu przez zadne aplikacje.</translation>
-    </message>
-    <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Modul</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Rozmiar</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Uzyty#</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>To jest lista wszystkich aktualnie zaladowanych modulow jadra.
 
 Kliknij i przytrzymaj na module aby zobaczyc wiecej informacji na jego temat lub wy go usunac z pamieci.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Wybierz tu polecenie i kliknij przycisk Wyslij po prawej zeby wyslac polecenie do wybranego powyzej modulu.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Wyslij</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Kliknij tu zeby wyslac wybrane polecenie do wybranego powyzej modulu.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Ten obszar prezentuje szczegolowe informacje o tym module.</translation>
     </message>
     <message>
         <source>Used by</source>
         <translation>Uzywany przez</translation>
     </message>
     <message>
-        <source>You really want to execute %1 for this module?</source>
-        <translation 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>
         <source>Available (%1 kB)</source>
         <translation>Wolne (%1 kB)</translation>
     </message>
     <message>
         <source> : %1 kB</source>
         <translation>: %1 kB</translation>
     </message>
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>polecenie</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Czas</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation>To jest lista wszystkich procesow dzialajacych na tym urzadzeniu.
 
 Kliknij i przytrzymaj na procesie by zobaczyc dodatkowe informacje o nim lub by wyslac do niego sygnal.</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation>Wybierz tu sygnal i kliknij przycisk Wyslij po prawej by go wyslac do procesu.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Wyslij</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation>Kliknij tu by wyslac wybrany sygnal do tego procesu.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>Ten obszar prezentuje szczegolowe informacje o tym procesie.</translation>
     </message>
     <message>
-        <source>You really want to send %1 to this process?</source>
-        <translation type="obsolete">Czy na pewno chcesz wyslac %1 do tego procesu?</translation>
-    </message>
-    <message>
         <source>Really want to send %1
 to this process?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>Informacja o systemie</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Pamiec</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Dyski</translation>
     </message>
     <message>
         <source>CPU</source>
         <translation>Procesor</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Procesy</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Wersja</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>Moduly</translation>
     </message>
     <message>
         <source>Benchmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syslog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Jadro Linuksa&lt;/b&gt;&lt;p&gt;Wersja: </translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Kompilowane przez: </translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Wersja: </translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Zbudowane na: </translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>&lt;p&gt;Wersja:</translation>
     </message>
     <message>
-        <source>&lt;p&gt;Model: </source>
-        <translation 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>
         <source>Built against Qt/E </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,48 +1,41 @@
 <!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>
     </message>
     <message>
         <source>Quit</source>
         <translation>Wyjdz</translation>
     </message>
     <message>
         <source>Click Play to start</source>
         <translation>Wcisnij Graj do startu</translation>
     </message>
     <message>
         <source>Make your move</source>
         <translation>Wykonaj ruch</translation>
     </message>
     <message>
         <source>You won!</source>
         <translation>Wygrales!</translation>
     </message>
     <message>
         <source>Computer won!</source>
         <translation>Komputer wygral!</translation>
     </message>
     <message>
         <source>It&apos;s a draw</source>
         <translation>Remis</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/today.ts b/i18n/pl/today.ts
index 724e2c9..e61ca72 100644
--- a/i18n/pl/today.ts
+++ b/i18n/pl/today.ts
@@ -1,146 +1,142 @@
 <!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>
         <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>
         <translation>Dzisiaj</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
         <translation>Dzisiaj - autor: Maximilian Reiß</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>Kliknij tu ąeby wyświetlic okno konfiguracyjne</translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>Które wtyczki i w jakiej kolejności ładowac:</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>Do góry</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>Do dołu</translation>
     </message>
     <message>
         <source>active/order</source>
         <translation>aktywne/kolejność</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>różne</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>Zaznacz/odznacz pole by włączyć/wyłączyć wtyczkę lub używając przycisków ze strzałkami po prawej stronie zmień kolejność wyświetlania</translation>
     </message>
     <message>
         <source>Today Config</source>
         <translation>Konfiguracja Dzisiaj</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>Zaznacz to jeśli program ma być automatycznie uruchamiany po wznowieniu.</translation>
     </message>
     <message>
         <source>autostart on resume?</source>
         <translation>autostart po wznowieniu?</translation>
     </message>
     <message>
         <source>tiny banner</source>
         <translation>malutki baner</translation>
     </message>
     <message>
         <source>Have small banner </source>
         <translation>Pokazuj mały baner</translation>
     </message>
     <message>
         <source> min</source>
         <translation>min</translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation>minut nieaktywny</translation>
     </message>
     <message>
         <source> pixel</source>
         <translation>pixeli</translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
         <translation>Ustaw rozmiar ikon w pikselach</translation>
     </message>
     <message>
         <source>icon size</source>
         <translation>rozmiar ikon</translation>
     </message>
     <message>
         <source> sec</source>
         <translation>sek</translation>
     </message>
     <message>
         <source>never</source>
         <translation>nigdy</translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
         <translation>Jak często program powinien odświeżać dane</translation>
     </message>
     <message>
         <source>refresh</source>
         <translation>odśwież</translation>
     </message>
 </context>
 </TS>
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
@@ -1,649 +1,565 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>&lt;h1&gt;Alarm at %1&lt;/h1&gt;&lt;br&gt;</source>
         <translation>&lt;h1&gt;Alarm o %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">Nieprzypisane</translation>
     </message>
 </context>
 <context>
     <name>NewTaskDlg</name>
     <message>
         <source>New Task</source>
         <translation type="unfinished">Nowe zadanie</translation>
     </message>
     <message>
         <source>Blank task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Using template:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Alarms</source>
         <translation>Alarmy</translation>
     </message>
     <message>
         <source>Information</source>
         <translation>Informacja</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
         <source>Recurrence</source>
         <translation>Powtarzalność</translation>
     </message>
     <message>
         <source>Task Editor</source>
         <translation>Edytor zadań</translation>
     </message>
 </context>
 <context>
     <name>Opie</name>
     <message>
         <source>Todo List</source>
         <translation type="unfinished">Lista ZrobTo</translation>
     </message>
     <message>
         <source>Task</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
         <translation>Wprowadź zadanie</translation>
     </message>
     <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.
 Zwolnij trochę pamięci
 i spróbuj ponownie.
 
 Wyjść mimo to?</translation>
     </message>
     <message>
         <source>Todo</source>
         <translation>ZrobTo</translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation>wszystkie zadania?</translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation>wszystkie 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>
         <source>Edit</source>
         <translation>Edytuj</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Usuń</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation>Nowy szablon %1</translation>
     </message>
     <message>
         <source>Click here to set the priority of new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Kliknij tu żeby ustawić priorytet nowego zadania.
 
 Ten obszar nazywa się szybkim paskiem zadań.
 
 Dzięki niemu możesz szybko dodać zadanie do listy. Może on być pokazany lub ukryty przez wybranie Opcje-&gt;&apos;Pokaż szybki pasek zadań&apos; z powyższego menu.</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>Wpisz tu opis nowego zadania.
 
 Ten obszar nazywa się szybkim paskiem zadań.
 
 Dzięki niemu możesz szybko dodać zadanie do listy. Może on być pokazany lub ukryty przez wybranie Opcje-&gt;&apos;Pokaż szybki pasek zadań&apos; z powyższego menu.</translation>
     </message>
     <message>
         <source>More</source>
         <translation>Więcej</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>Kliknij tu żeby wpisać dodatkowe informacje dla nowego zadania.
 
 Ten obszar nazywa się szybkim paskiem zadań.
 
 Dzięki niemu możesz szybko dodać zadanie do listy. Może on być pokazany lub ukryty przez wybranie Opcje-&gt;&apos;Pokaż szybki pasek zadań&apos; z powyższego menu.</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Wpisz</translation>
     </message>
     <message>
         <source>Click here to add new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Kliknij tu żeby dodać zadanie.
 
 Ten obszar nazywa się szybkim paskiem zadań.
 
 Dzięki niemu możesz szybko dodać zadanie do listy. Może on być pokazany lub ukryty przez wybranie Opcje-&gt;&apos;Pokaż szybki pasek zadań&apos; z powyższego menu.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
     <message>
         <source>Click here to reset new task information.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Kliknij tu żeby wyczyścić informacje o nowym zadaniu.
 
 Ten obszar nazywa się szybkim paskiem zadań.
 
 Dzięki niemu możesz szybko dodać zadanie do listy. Może on być pokazany lub ukryty przez wybranie Opcje-&gt;&apos;Pokaż szybki pasek zadań&apos; z powyższego menu.</translation>
     </message>
     <message>
         <source>Data can not be edited, currently syncing</source>
         <translation>Dane nie mogą być zmienione, trwa synchronizacja</translation>
     </message>
     <message>
         <source>Data can&apos;t be edited, currently syncing</source>
         <translation>Dane nie mogą być zmienione, trwa synchronizacja</translation>
     </message>
     <message>
         <source>Summary</source>
         <translation>Podsumowanie</translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>Table View</source>
         <translation>Widok tabeli</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Brak</translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation>%1 dni</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>New</source>
         <translation>Nowe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Edytuj</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Usuń</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Czas</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Description:</source>
         <translation>Opis:</translation>
     </message>
     <message>
         <source>Enter brief description of the task here.</source>
         <translation>Wpisz tu krótki opis zadania.</translation>
     </message>
     <message>
         <source>Complete </source>
         <translation>Zakończ</translation>
     </message>
     <message>
         <source>Work on </source>
         <translation>Pracuj nad</translation>
     </message>
     <message>
         <source>Buy </source>
         <translation>Kup</translation>
     </message>
     <message>
         <source>Organize </source>
         <translation>Organizuj</translation>
     </message>
     <message>
         <source>Get </source>
         <translation>Zdobądź</translation>
     </message>
     <message>
         <source>Update </source>
         <translation>Aktualizuj</translation>
     </message>
     <message>
         <source>Create </source>
         <translation>Stwórz</translation>
     </message>
     <message>
         <source>Plan </source>
         <translation>Planuj</translation>
     </message>
     <message>
         <source>Call </source>
         <translation>Zadzwoń</translation>
     </message>
     <message>
         <source>Mail </source>
         <translation>Pisz list</translation>
     </message>
     <message>
         <source>Select priority of task here.</source>
         <translation>Wybierz tu priorytet zadania.</translation>
     </message>
     <message>
         <source>Very High</source>
         <translation>Bardzo wysoki</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Wysoki</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normalny</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Niski</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>Bardzo niski</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategoria:</translation>
     </message>
     <message>
         <source>Select category to organize this task with.</source>
         <translation>Wybierz kategorię dla tego zadania.</translation>
     </message>
     <message>
         <source>Recurring task</source>
         <translation>Zadanie powtarzalne</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>Kliknij tu jeśli zadanie powtarza się w regularnych odstępach czasu. Częstotliwość można ustawić w zakładce Powtarzalność.</translation>
     </message>
     <message>
         <source>Enter any additional information about this task here.</source>
         <translation>Wpisz tu wszelkie dodatkowe informacje o tym zadaniu.</translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation>Lista ZrobTo</translation>
     </message>
     <message>
         <source>Summary:</source>
         <translation>Podsumowanie:</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>Kliknij tu żeby ustawić aktualny status tego zadania.</translation>
     </message>
     <message>
         <source>Started</source>
         <translation>Rozpoczęte</translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation>Przełożone</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>Ukończone</translation>
     </message>
     <message>
         <source>Not started</source>
         <translation>Nie zaczęte</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Postęp:</translation>
     </message>
     <message>
         <source>Select progress made on this task here.</source>
         <translation>Wybierz tu postęp prac nad tym zadaniem.</translation>
     </message>
     <message>
         <source>0 %</source>
         <translation>0%</translation>
     </message>
     <message>
         <source>20 %</source>
         <translation>20%</translation>
     </message>
     <message>
         <source>40 %</source>
         <translation>40%</translation>
     </message>
     <message>
         <source>60 %</source>
         <translation>60%</translation>
     </message>
     <message>
         <source>80 %</source>
         <translation>80%</translation>
     </message>
     <message>
         <source>100 %</source>
         <translation>100%</translation>
     </message>
     <message>
         <source>Start Date:</source>
         <translation>Data poczatkowa:</translation>
     </message>
     <message>
         <source>Click here to set the date this task was started.</source>
         <translation>Kliknij tu żeby ustawić datę początkową tego zadania.</translation>
     </message>
     <message>
         <source>Due Date:</source>
         <translation>Data końcowa:</translation>
     </message>
     <message>
         <source>Click here to set the date this task needs to be completed by.</source>
         <translation>Kliknij tu żeby ustawić datę końcową tego zadania.</translation>
     </message>
     <message>
         <source>Completed:</source>
         <translation>Ukończone:</translation>
     </message>
     <message>
         <source>Click here to mark this task as completed.</source>
         <translation>Kliknij tu żeby zaznaczyć zadanie jako ukończone.</translation>
     </message>
     <message>
         <source>Click here to set the date this task was completed.</source>
         <translation>Kliknij tu żeby ustawić datę ukończenia tego zadania.</translation>
     </message>
     <message>
         <source>Maintainer Mode:</source>
         <translation>Tryb opiekuna:</translation>
     </message>
     <message>
         <source>Click here to set the maintainer&apos;s role.</source>
         <translation>Kliknij tu żeby ustawić rolę opiekuna.</translation>
     </message>
     <message>
         <source>Nothing</source>
         <translation>Żadna</translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation>Odpowiedzialny</translation>
     </message>
     <message>
         <source>Done By</source>
         <translation>Zrobione przez</translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation>Koordynator</translation>
     </message>
     <message>
         <source>Maintainer:</source>
         <translation>Opiekun:</translation>
     </message>
     <message>
         <source>This is the name of the current task maintainer.</source>
         <translation>To jest imię opiekuna aktualnego zadania.</translation>
     </message>
     <message>
         <source>test</source>
         <translation>test</translation>
     </message>
     <message>
         <source>Click here to select the task maintainer.</source>
         <translation>Kliknij tu żeby wybrać opiekuna zadania.</translation>
     </message>
 </context>
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,909 +1,566 @@
 <!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>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Pole 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Pole 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Pole 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Pole 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Pole 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Informacje:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Nowy wpis</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Komentarz</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Pole 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Pole 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Hasło</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Użytkownik</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Hasło</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>PlikDlg</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>filtr typu pliku</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation>Lista wyboru typu pliku
 
 edytuj lub wybierz filtr</translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation>potwierdza wybór i zamyka formularz</translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation>anuluje wybór i zamyka formularz</translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation>Anuluj</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation>pokazuje wybraną nazwę pliku</translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation>Edycja nazwy pliku
 
 pokazuje wybrany plik
 i pozwala na edycję jego nazwy</translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation>Lista wyboru katalogu
 edytuj lub wybierz nazwę katalogu</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
     <message>
         <source>size</source>
         <translation>rozmiar</translation>
     </message>
     <message>
         <source>type</source>
         <translation>typ</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>lista katalogów</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation>Lista katalogów
 
 pokazuje listę katalogów i plików</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation>katalog</translation>
     </message>
     <message>
         <source>file</source>
         <translation>plik</translation>
     </message>
     <message>
         <source>link</source>
         <translation>link</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Szukaj</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Użytkownik</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Komentarz</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <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>
         <source>&amp;Import text file</source>
         <translation>&amp;Importuj plik tekstowy</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
         <translation>&amp;Usuń plik tekstowy</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
         <translation>&amp;Otwieraj wpisy rozwinięte</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
         <translation>&amp;Koniec</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Plik</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Nowa</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Edytuj</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Usuń</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategoria</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Wytnij</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopiuj</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>W&amp;klej</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Szukaj</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Wpis</translation>
     </message>
     <message>
         <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>
         <source>Comment</source>
         <translation>Komentarz</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Pole 4</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
         <translation>Nie można usunąć pliku tekstowego.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
         <translation>Nie można eksportować do pliku tekstowego.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
         <translation>Nie można importować z pliku tekstowego.</translation>
     </message>
     <message>
         <source>Enter Password</source>
         <translation>Podaj hasło</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
         <translation>Błędne hasło.
 
 ZSafe zostanie zamknięty.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
         <translation>Błędne hasło.
 Wpisz ponownie?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Tak</translation>
     </message>
     <message>
         <source>&amp;No.</source>
         <translation>&amp;Nie.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
         <translation>Pusty dokument albo
 błędne hasło.
 Kontynuować?</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;Nie</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
         <translation>&amp;Tak.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
         <translation>Hasło jest pusty.
 Podaj je ponownie.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
         <translation>Wpisz ponownie hasło</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
         <translation>Hasła muszą być identyczne.
 Wpisz jeszcze raz.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
         <translation>Plik z hasłami zapisany.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
         <translation>Czy chcesz zapisać dane
 przed wyjściem?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation>&amp;Zapisz</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
         <translation>Zapisz z nowym &amp;hasłem</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
         <translation>&amp;Nie zapisuj</translation>
     </message>
     <message>
         <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>
         <source>Find entry</source>
         <translation>Znajdź wpis</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Wszystkie</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Tekst</translation>
     </message>
     <message>
         <source>Remove text file</source>
         <translation>Usuń plik tekstowy</translation>
     </message>
     <message>
         <source>No document defined.
 You have to create a new document</source>
         <translation>Brak dokumentu.
 Musisz stworzyć nowy dokument</translation>
     </message>
     <message>
         <source>Export text file</source>
         <translation>Eksportuj plik tekstowy</translation>
     </message>
     <message>
         <source>Import text file</source>
         <translation>Importuj plik tekstowy</translation>
     </message>
     <message>
         <source>Do you want to save </source>
         <translation>Czy chcesz zapisać</translation>
     </message>
     <message>
         <source>
 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>
         <source>&lt;P&gt;You must create a new document first. Ok to create?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Password Manager&lt;br&gt;ZSafe version 2.1.2&lt;br&gt;&lt;/b&gt;by Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Translations by Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,568 +1,488 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation>Nome Completo</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Contacto</translation>
     </message>
     <message>
         <source>Pick</source>
         <translation>Escolher</translation>
     </message>
 </context>
 <context>
     <name>AbView</name>
     <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>
         <source>Unable to find a contact for this search pattern!</source>
         <translation>Não foi encontrado nenhum contacto para esta pesquisa!</translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation>O ficheiro selecionado
 não tem a extensão &quot;.vcf&quot;.
 Tem a certeza que o quer abrir?</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>Adicionar Contacto?</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>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation>Tipo de Pesquisa</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>Expressões Regulares</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>Usar expressões (*,?)</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Ignorar letras grandes/pequenas</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>E-Mail</translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation>Preferir QT-Mail</translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation>Preferir Opie-Mail</translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation>Atenção: O QT-Mail só 
 está disponível para o 
 SHARP. O Opie-Mail é
 livre e está disponível em
 todos os dispositivos!</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Vários</translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation>Configurações da Procura</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Fonte</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Pequena</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Grande</translation>
     </message>
     <message>
         <source>Order</source>
         <translation>Ordem</translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation>Selecione a Ordem dos Contactos:</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Cima</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Baixo</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Adicionar</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Remover</translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation>Configuração</translation>
     </message>
     <message>
         <source>Click on tab to select one</source>
         <translation>Clique na pasta para seleccionar uma</translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation>Configurações para o estilo da procura</translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation>A procura usa expressões regulares se for selecionado</translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
         <translation>A procura usa apenas expressões simples</translation>
     </message>
     <message>
         <source>If selected, search differs between upper and lower chars</source>
         <translation>Se selecionado, a procura diferencia entre os caractéres grandes e pequenos</translation>
     </message>
     <message>
         <source>Font size for list- and card view</source>
         <translation>Tamanho da fonte para a lista e para a vista dos cartões</translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
         <translation>Configurações da fonte para a lista e para a vista de cartões</translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation>Usar a aplicação de mail da Sharp, se disponível</translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</source>
         <translation>Usar a aplicação de mail do Opie, se disponível</translation>
     </message>
     <message>
         <source>Move selected attribute one line up</source>
         <translation>Mover o atributo selecionado para cima uma linha</translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation>MoMover o atributo selecionado para baixo uma linha</translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation>Lista de todos os atributos disponíveis</translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation>Adicione os atributos selecionados da lista abaixo para a lista acima</translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation>Remove os atributos selecionados da lista acima</translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation>Ordena (cima -&gt; baixo) define o contacto primário a mostrar na segunda coluna da vista em lista</translation>
     </message>
     <message>
         <source>Tool-/Menubar</source>
         <translation>Ferramenta-/Menu</translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation>Fixo</translation>
     </message>
     <message>
         <source>Switch to fixed menu-/toolbars after restarting application !</source>
         <translation>Mudar para menus ou barras de ferramentas fixas depois de reiniciar a aplicação!</translation>
     </message>
     <message>
         <source>Moveable</source>
         <translation>Amovível</translation>
     </message>
     <message>
         <source>Switch to moveable menu-/toolbars after restarting application !</source>
         <translation>Mudar para menus ou barras de ferramentas amovíveis depois de reiniciar a aplicação!</translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>First Name</source>
         <translation>Nome</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Nome do Meio</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Apelido</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Sufixo</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Arquivar Como</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Sexo</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Título</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Cidade</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Estado</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>País</translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation>Nome Completo...</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Organização</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Categoria</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Notas...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Geral</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Emprego</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Casa</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Endereço</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>Código Postal</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>Estados Unidos</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Inglaterra</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>Japão</translation>
     </message>
     <message>
         <source>France</source>
         <translation>França</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>Alemanha</translation>
     </message>
     <message>
         <source>Norway</source>
         <translation>Noruega</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>Canadá</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Masculino</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Feminino</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Detalhes</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>Introduza Nota</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>Editar Nome</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Contactos</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation>Albânia</translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation>Algéria</translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation>Samoa Americana</translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation>Andorra</translation>
     </message>
     <message>
         <source>Angola</source>
         <translation>Angola</translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation>Anguilla</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>Argetina</translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation>Aruba</translation>
     </message>
     <message>
         <source>Australia</source>
         <translation>Austrália</translation>
     </message>
     <message>
         <source>Austria</source>
         <translation>Áustria</translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation>Azerbeijão</translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation>Bahamas</translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation>Bahrain</translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation>Bangladesh</translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation>Barbados</translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation>Bielorússia</translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation>Bélgica</translation>
     </message>
@@ -1013,552 +933,385 @@ todos os dispositivos!</translation>
     <message>
         <source>Oman</source>
         <translation>Oman</translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation>Paquistão</translation>
     </message>
     <message>
         <source>Palau</source>
         <translation>Palau</translation>
     </message>
     <message>
         <source>Panama</source>
         <translation>Panamá</translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation>Papua Nova Guiné</translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation>Paraguai</translation>
     </message>
     <message>
         <source>Peru</source>
         <translation>Peru</translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation>Filipinas</translation>
     </message>
     <message>
         <source>Poland</source>
         <translation>Polónia</translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation>Portugal</translation>
     </message>
     <message>
         <source>Puerto Rico</source>
         <translation>Porto Rico</translation>
     </message>
     <message>
         <source>Qatar</source>
         <translation>Qatar</translation>
     </message>
     <message>
         <source>Reunion</source>
         <translation>Ilha da Reunião</translation>
     </message>
     <message>
         <source>Romania</source>
         <translation>Roménia</translation>
     </message>
     <message>
         <source>Russia</source>
         <translation>Rússia</translation>
     </message>
     <message>
         <source>Rwanda</source>
         <translation>Ruanda</translation>
     </message>
     <message>
         <source>Saint Lucia</source>
         <translation>Santa Lúcia</translation>
     </message>
     <message>
         <source>Samoa</source>
         <translation>Samoa</translation>
     </message>
     <message>
         <source>San Marino</source>
         <translation>São Marinho</translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
         <translation>Arábia Saudita</translation>
     </message>
     <message>
         <source>Senegal</source>
         <translation>Senegal</translation>
     </message>
     <message>
         <source>Seychelles</source>
         <translation>Seicheles</translation>
     </message>
     <message>
         <source>Sierra Leone</source>
         <translation>Serra Leoa</translation>
     </message>
     <message>
         <source>Singapore</source>
         <translation>Singapura</translation>
     </message>
     <message>
         <source>Slovakia</source>
         <translation>Eslováquia</translation>
     </message>
     <message>
         <source>Slovenia</source>
         <translation>Eslovénia</translation>
     </message>
     <message>
         <source>Solomon Islands</source>
         <translation>Ilhas Salomão</translation>
     </message>
     <message>
         <source>Somalia</source>
         <translation>Somália</translation>
     </message>
     <message>
         <source>South Africa</source>
         <translation>África do Sul</translation>
     </message>
     <message>
         <source>Spain</source>
         <translation>Espanha</translation>
     </message>
     <message>
         <source>Sri Lanka</source>
         <translation>Sri Lanca</translation>
     </message>
     <message>
         <source>St. Helena</source>
         <translation>Santa Helena</translation>
     </message>
     <message>
         <source>Sudan</source>
         <translation>Sudão</translation>
     </message>
     <message>
         <source>Suriname</source>
         <translation>Suriname</translation>
     </message>
     <message>
         <source>Swaziland</source>
         <translation>Swazilandia</translation>
     </message>
     <message>
         <source>Sweden</source>
         <translation>Suécia</translation>
     </message>
     <message>
         <source>Switzerland</source>
         <translation>Suiça</translation>
     </message>
     <message>
         <source>Taiwan</source>
         <translation>Tailândia</translation>
     </message>
     <message>
         <source>Tajikistan</source>
         <translation>Tajikistão</translation>
     </message>
     <message>
         <source>Tanzania</source>
         <translation>Tanzânia</translation>
     </message>
     <message>
         <source>Thailand</source>
         <translation>Tailândia</translation>
     </message>
     <message>
         <source>Togo</source>
         <translation>Togo</translation>
     </message>
     <message>
         <source>Tokelau</source>
         <translation>Tokelau</translation>
     </message>
     <message>
         <source>Tonga</source>
         <translation>Tonga</translation>
     </message>
     <message>
         <source>Tunisia</source>
         <translation>Tunísia</translation>
     </message>
     <message>
         <source>Turkey</source>
         <translation>Turquia</translation>
     </message>
     <message>
         <source>Turkmenistan</source>
         <translation>Turkmenistão</translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation>Tuvalu</translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation>Uganda</translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation>Ucrânia</translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation>Uruguai</translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation>Uzbekistão</translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation>Vanuatu</translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation>Venezuela</translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation>Ilhas Virgens</translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation>Sahara Ocidental</translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation>Yemen</translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation>Juguslávia</translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation>Zâmbia</translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation>Zimbabué</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Nascimento</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Aniversário</translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation>Kuwait</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Desconhecido</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Afghanistan</source>
         <translation>Afeganistão</translation>
     </message>
     <message>
         <source>Antarctica</source>
         <translation>Antártica</translation>
     </message>
     <message>
         <source>Armenia</source>
         <translation>Arménia</translation>
     </message>
     <message>
         <source>Bolivia</source>
         <translation>Bolívia</translation>
     </message>
     <message>
         <source>Cameroon</source>
         <translation>Camarões</translation>
     </message>
     <message>
         <source>Ghana</source>
         <translation>Guana</translation>
     </message>
     <message>
         <source>Guadeloupe</source>
         <translation>Guadalupe</translation>
     </message>
     <message>
         <source>Guinea-Bissau</source>
         <translation>Guiné-Bissau</translation>
     </message>
     <message>
         <source>Jamaica</source>
         <translation>Jamaica</translation>
     </message>
     <message>
         <source>Kiribati</source>
         <translation>Kiribati</translation>
     </message>
     <message>
         <source>Kyrgyzstan</source>
         <translation>Kyrgyzistão</translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
         <translation>Territórios Soberanos Palestinianos</translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
         <translation>Ilhas Pitcairn</translation>
     </message>
     <message>
         <source>Vietnam</source>
         <translation>Vietnam</translation>
     </message>
     <message>
         <source>Press to enter last- middle and firstname</source>
         <translation>Prima enter para aceitar o último, do meio e primeiro nome</translation>
     </message>
     <message>
         <source>Enter fullname directly ! If you have a lastname with multiple words ( for instance &quot;de la Guerra&quot;), please write &lt;lastname&gt;,&lt;firstnames&gt; like this: &quot;de la Guerra, Carlos Pedro&quot;</source>
         <translation>Introduza o nome completo directamente. Se tiver um apelido com várias palavras (por exemplo, &quot;da Silva&quot;), escreva &lt;apelido&gt;,&lt;nomes&gt; tal como: &quot;da Silva, Rosa Margarida&quot;</translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation>O título (emprego)..</translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation>Exemplo: &quot;jr.&quot;..</translation>
     </message>
     <message>
         <source>The working place of the contact</source>
         <translation>O local de trabalho do contacto</translation>
     </message>
     <message>
         <source>Press to select attribute to change</source>
         <translation>Use para escolher o atributo a mudar</translation>
     </message>
     <message>
         <source>Press to select how to store the name (and howto show it in the listview)</source>
         <translation>Use para escolher o formato para gravar o nome e mostrar na lista</translation>
     </message>
     <message>
         <source></source>
         <translation></translation>
     </message>
 </context>
 <context>
     <name>Opie</name>
     <message>
         <source>Contact</source>
         <translation type="unfinished">Contacto</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation type="unfinished">Contactos</translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation type="unfinished">Iniciar Procura</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation type="unfinished">Enviar EMail</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation type="unfinished">Importar cartão de visita</translation>
     </message>
     <message>
         <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
@@ -1,456 +1,361 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>AdvancedFm</source>
         <translation>Gestor de Ficheiros Avançado</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Ficheiro</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation>Mostrar Escondidos</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>Criar Directoria</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Mudar Nome</translation>
     </message>
     <message>
         <source>Run Command</source>
         <translation>Executar Comando</translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation>Executar Comando e ver Resultado</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamanho</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sim</translation>
     </message>
     <message>
         <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>
         <source>Ir sent.</source>
         <translation>Enviado.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>Mudar Directoria</translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>Executar</translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation>Abrir como texto</translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation>Criar atalho Simbólico</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>Mover</translation>
     </message>
     <message>
         <source>File Info</source>
         <translation>Info do Ficheiro</translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation>Mudar Permissões</translation>
     </message>
     <message>
         <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>
         <source> As</source>
         <translation>Como</translation>
     </message>
     <message>
         <source>Switch to View 1</source>
         <translation>Mudar para a Vista 1</translation>
     </message>
     <message>
         <source>Switch to View 2</source>
         <translation>Mudar para a Vista 2</translation>
     </message>
     <message>
         <source>Not Yet Implemented</source>
         <translation>Ainda Não Implementado</translation>
     </message>
     <message>
-        <source>Could not copy 
-%1 
-to 
-%2</source>
-        <translation type="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>
         <source>Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1 files?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1 and all it&apos;s contents?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really copy %1 files?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 already  exists. Ok to overwrite?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Could not copy %1 to %2&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy %1 As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt; %1 already exists. Ok to overwrite?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not copy %1 to %2&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt; %1 already exists. Do you really want to delete it?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not move %1&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not copy %1 to %2&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Gravar resultado no ficheiro (apenas nome)</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Resultado</translation>
     </message>
     <message>
         <source>Process could not start</source>
         <translation>Não foi possível iniciar o processo</translation>
     </message>
     <message>
         <source>Error
 </source>
         <translation>Erro
 </translation>
     </message>
     <message>
         <source>
 Finished
 </source>
         <translation>
 Terminado
 </translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Alterar Permissões do Ficheiro</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Alterar Permissões do Ficheiro para:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>utilizador</translation>
     </message>
     <message>
         <source>group</source>
         <translation>grupo</translation>
     </message>
     <message>
         <source>others</source>
         <translation>outros</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Utilizador</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Grupo</translation>
     </message>
     <message>
         <source>read</source>
         <translation>ler</translation>
     </message>
     <message>
         <source>write</source>
         <translation>escrever</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>executar</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Atenção</translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation>Erro - sem utilizador</translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation>Erro - sem grupo</translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation>Erro ao alterar o utilizador ou grupo</translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation>Erro ao alterar o modo</translation>
     </message>
     <message>
         <source>filePermissions</source>
         <translation>Permissões de Ficheiro</translation>
     </message>
 </context>
 </TS>
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
@@ -1,293 +1,233 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Appearance</name>
     <message>
         <source>Settings...</source>
         <translation>Configurações...</translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation>Esquema actual</translation>
     </message>
     <message>
         <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>
         <source>Drop down list</source>
         <translation>Lista</translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation>Lista com icones</translation>
     </message>
     <message>
         <source>Top</source>
         <translation>Em Cima</translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation>Em Baixo</translation>
     </message>
     <message>
         <source>Style</source>
         <translation>Estilo</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Fonte</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Cores</translation>
     </message>
     <message>
         <source>Windows</source>
         <translation>Janelas</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Avançadas</translation>
     </message>
     <message>
-        <source>Restart</source>
-        <translation 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.
 
 Nota: esta opção não está disponível em todos os estilos.</translation>
     </message>
     <message>
         <source>Window decorations control the way the application title bar and its buttons appear.
 
 Click here to select an available decoration.</source>
         <translation>A decoração das janelas controla a forma com que serão desenhadas a barra do título e respectivos botões.
 
 Clique aqui para escolher uma decoração.</translation>
     </message>
     <message>
         <source>Select the desired name, style and size of the default font applications will use.</source>
         <translation>Escolha o nome, estilo e tamanho da fonte por omissão a ser usada pelas aplicações.</translation>
     </message>
     <message>
         <source>Color schemes are a collection of colors which are used for various parts of the display.
 
 Click here to select an available scheme.</source>
         <translation>Os esquemas de cores são uma coleção de cores a serem usadas em várias zonas do ecrã.
 
 Clique aqui para escolher um esquema.</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation>Clique aqui para que as pastas apareçam em cima.</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation>Clique aqui para que as pastas apareçam em baixo.</translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation>Esta é uma janela de previsão. Aqui poderá prever como as suas opções alterarão a aparência.</translation>
     </message>
     <message>
         <source>Appearance Settings</source>
         <translation>Configurações de Aparência</translation>
     </message>
     <message>
         <source>Rotation direction:</source>
         <translation>Sentido da rotação:</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>
         <translation>Editar esquema</translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation>Clique aqui para escolher uma cor para:</translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
         <translation>Exemplo</translation>
     </message>
     <message>
         <source>Normal Item</source>
         <translation>Item Normal</translation>
     </message>
     <message>
         <source>Disabled Item</source>
         <translation>Item Desabilitado</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Menu</translation>
     </message>
     <message>
         <source>Normal Text</source>
         <translation>Texto Normal</translation>
     </message>
     <message>
         <source>Highlighted Text</source>
         <translation>Texto Escolhido</translation>
     </message>
     <message>
         <source>Button</source>
         <translation>Botão</translation>
     </message>
     <message>
         <source>Check Box</source>
         <translation>Caixa de Selecção</translation>
     </message>
     <message>
         <source>Sample window using the selected settings.</source>
         <translation>Janela de exemplo usando as configurações selecionadas.</translation>
     </message>
 </context>
 </TS>
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
@@ -1,625 +1,593 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation>Filtro por Categoria</translation>
     </message>
     <message>
         <source>Select one or more groups</source>
         <translation>Selecione um ou mais grupos</translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation>A ler a configuração...</translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancelar</translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
         <translation>Fechar</translation>
     </message>
     <message>
         <source>Remove
 </source>
         <translation>Apagar
 </translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation>Instalar
 </translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation>Actualizar
 </translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation>(Re-Instalar)</translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation>(Actualizar)</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation>Destino</translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation>Espaço Disponível</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Resultado</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Iniciar</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opções</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tudo</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Texto</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation>Abortar</translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation>
 **** Abortado pelo utilizador ****</translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation>**** Processo Abortado ****</translation>
     </message>
     <message>
         <source>Save output</source>
         <translation>Gravar Resultado</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Desconhecido</translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation>%1 Kb</translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation>Opções</translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation>Ignorar Dependências</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation>Forçar Reinstalação</translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation>Forçar Remoção</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation>Forçar Sobreposição</translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation>Nível de Informação</translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation>Apenas Erros</translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation>Mensagens Normais</translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation>Mensagens de informação</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation>Analisar resultado</translation>
     </message>
 </context>
 <context>
     <name>Ipkg</name>
     <message>
         <source>Dealing with package %1</source>
         <translation>A processar o pacote %1</translation>
     </message>
     <message>
         <source>Removing symbolic links...
 </source>
         <translation>A remover links simbólicos...
 </translation>
     </message>
     <message>
         <source>Creating symbolic links for %1.</source>
         <translation>A criar os links simbólicos para %1.</translation>
     </message>
     <message>
         <source>Creating symbolic links for %1</source>
         <translation>A criar os links simbólicos para %1</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>Concluído</translation>
     </message>
     <message>
         <source>Removing status entry...</source>
         <translation>A remover o ficheiro de estado...</translation>
     </message>
     <message>
         <source>status file - </source>
         <translation>ficheiro de estado -</translation>
     </message>
     <message>
         <source>package - </source>
         <translation>pacote - </translation>
     </message>
     <message>
         <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>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation>AQPkg - Gestor de Software</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation>Introduza o texto para procurar aqui.</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation>Clique aqui para esconder a barra de ferramentas de salto rápido.</translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation>Actualizar Listas</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation>Clique aqui para actualizar a lista de pacotes dos servidores.</translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation>Actualizar</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation>Clique aqui para actualizar todos os pacotes que tenham disponível uma versão mais recente.</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Obter</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation>Clique aqui para obter os pacotes seleccionados.</translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation>Aplicar Alterações</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation>Clique aqui para instalar, remover ou actualizar os pacotes seleccionados.</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Acções</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation>Mostrar pacotes por instalar</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation>Clique aqui para mostrar os pacotes disponíveis que não estão instalados.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation>Mostrar pacotes instalados</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation>Clique aqui para motrar os pacotes instalados neste dispositivo.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation>Mostrar pacotes por actualizar</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation>Clique aqui para motrar os pacotes instalados neste dispositivo e que tenham disponível uma versão mais recente.</translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation>Filtrar por categoria</translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation>Clique aqui para mostrar os pacotes que pertençam a uma determinada categoria.</translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation>Filtrar por categoria</translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation>Clique aqui para mudar a filtragem de pacotes por categoria.</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Procurar</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation>Clique aqui para procurar pacotes por texto no nome.</translation>
     </message>
     <message>
         <source>Find next</source>
         <translation>Procurar Próxima</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation>Clique aqui para procurar o próximo pacote que contenha o texto que procura no nome.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation>Teclado de Salto Rápido</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation>Clique aqui para mostrar ou esconder o teclado que permite um movimento rápido na lista de pacotes.</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Configurar</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation>Clique aqui para configurar esta aplicação.</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation>Clique aqui para esconder a barra de pesquisa.</translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation>Servidores:</translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation>Clique aqui para seleccionar uma fonte de pacotes.</translation>
     </message>
     <message>
         <source>Packages</source>
         <translation>Pacotes</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 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>Esta é a lista de todos os pacotes disponíveis no servidor seleccionado.
 
 Um ponto azul perto do nome do pacote indica que está instalado.
 
 Um ponto azul com uma estrela indica que existe uma nova versão disponível neste servidor.
 
 Clique na caixa à esquerda para seleccionar um pacote.</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation>Clique aqui para desinstalar os pacotes seleccionado.</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation>A criar a lista de servidores:
     %1</translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation>A criar a lista de servidores para:
     %1</translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
         <translation>A actualizar a lista de pacotes disponíveis</translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation>ATENÇÃO: Não é recomendada
 a actualização do Opie/Qtopia 
 enquanto o está a usar!
 
 Tem a certeza?</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Atenção</translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
         <translation>A actualizar os pacotes instalados</translation>
     </message>
     <message>
         <source>Are you sure you wish to delete
 %1?</source>
         <translation>Tem a certeza que quer apagar %1?</translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation>Tem a certeza?</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Não</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sim</translation>
     </message>
     <message>
         <source>Download to where</source>
         <translation>Obter para onde</translation>
     </message>
     <message>
         <source>Enter path to download to</source>
         <translation>Introduza a directoria para onde gravar</translation>
     </message>
     <message>
         <source>Install Remote Package</source>
         <translation>Instalar Pacotes Remotos</translation>
     </message>
     <message>
         <source>Enter package location</source>
         <translation>Introduza a localização do pacote</translation>
     </message>
     <message>
         <source>Nothing to do</source>
         <translation>Nada a fazer</translation>
     </message>
     <message>
         <source>No packages selected</source>
         <translation>Nenhum pacote selecionado</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Do you wish to remove or reinstall
 %1?</source>
         <translation>Quer remover ou reinstalar %1?</translation>
     </message>
     <message>
         <source>Remove or ReInstall</source>
         <translation>Remover ou Reinstalar</translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation>Reinstalar</translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation>Quer remover ou actualizar %1?</translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation>Remover ou Actualizar</translation>
     </message>
     <message>
         <source>Updating Launcher...</source>
         <translation>A actualizar a lista de aplicações...</translation>
     </message>
 </context>
 <context>
     <name>PackageWindow</name>
     <message>
         <source>&lt;b&gt;Description&lt;/b&gt; - </source>
         <translation>&lt;b&gt;Descrição&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Instalado Em&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Tamanho&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Secção&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Nome do Ficheiro&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Versão Instalada&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Versão Disponível&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>Package Information</source>
         <translation>Informação do Pacote</translation>
     </message>
     <message>
         <source>Package information is unavailable</source>
         <translation>A informação do pacote não está disponível</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Fechar</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Installed packages</source>
         <translation>Pacotes instalados</translation>
     </message>
     <message>
         <source>Local packages</source>
         <translation>Pacotes locais</translation>
     </message>
     <message>
         <source>N/A</source>
         <translation>N/A</translation>
     </message>
     <message>
         <source>Package - %1
               version - %2</source>
         <translation>Pacote - %1 versão %2</translation>
     </message>
     <message>
         <source>
               inst version - %1</source>
         <translation>versão instalada - %1</translation>
     </message>
     <message>
         <source>Version string is empty.</source>
         <translation>Sem versão.</translation>
     </message>
     <message>
         <source>Epoch in version is not number.</source>
         <translation>O valor da época na versão não é um número.</translation>
     </message>
     <message>
         <source>Nothing after colon in version number.</source>
         <translation>Nada depois do ponto no número da versão.</translation>
     </message>
 </context>
 <context>
     <name>QuestionDlg</name>
     <message>
         <source>Remove</source>
         <translation>Remover</translation>
     </message>
 </context>
 <context>
     <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation>Configuração</translation>
     </message>
     <message>
         <source>Servers</source>
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,169 +1,149 @@
 <!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>
     </message>
     <message>
         <source>Backup Failed!</source>
         <translation>Falhou a Cópia de Segurança!</translation>
     </message>
     <message>
         <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>
         <source>Restore Backup...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;%1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore</source>
         <translation type="unfinished">Reposição</translation>
     </message>
     <message>
         <source>Would you really overwrite your local data?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <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>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ErrorDialog</name>
     <message>
         <source>Error Info</source>
         <translation>Informação de Erro</translation>
     </message>
     <message>
         <source>Error Message:</source>
         <translation>Mensagem de Erro:</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;Ok</translation>
     </message>
 </context>
 </TS>
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,339 +1,331 @@
 <!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>
         <source>CE</source>
         <translation>CE</translation>
     </message>
     <message>
         <source>log</source>
         <translation>log</translation>
     </message>
     <message>
         <source>ln</source>
         <translation>ln</translation>
     </message>
     <message>
         <source>(</source>
         <translation>(</translation>
     </message>
     <message>
         <source>)</source>
         <translation>)</translation>
     </message>
     <message>
         <source>sin</source>
         <translation>sen</translation>
     </message>
     <message>
         <source>cos</source>
         <translation>cos</translation>
     </message>
     <message>
         <source>tan</source>
         <translation>tan</translation>
     </message>
     <message>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
         <source>+/-</source>
         <translation>+/-</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>=</source>
         <translation>=</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>.</source>
         <translation>.</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <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>
         <translation>Peso</translation>
     </message>
     <message>
         <source>Distance</source>
         <translation>Distancia</translation>
     </message>
     <message>
         <source>Area</source>
         <translation>Área</translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation>Temperatura</translation>
     </message>
     <message>
         <source>Volume</source>
         <translation>Volume</translation>
     </message>
     <message>
         <source>acres</source>
         <translation>acres</translation>
     </message>
     <message>
         <source>&#xb0;C</source>
         <translation>ºC</translation>
     </message>
     <message>
         <source>carats</source>
         <translation>caracs</translation>
     </message>
     <message>
         <source>cm</source>
         <translation>cm</translation>
     </message>
     <message>
         <source>cu cm</source>
         <translation>cm cub</translation>
     </message>
     <message>
         <source>cu ft</source>
         <translation>pés cub</translation>
     </message>
     <message>
         <source>cu in</source>
         <translation>pol cub</translation>
     </message>
     <message>
         <source>&#xb0;F</source>
         <translation>ºF</translation>
     </message>
     <message>
         <source>fl oz (US)</source>
         <translation>oz fl (US)</translation>
     </message>
     <message>
         <source>ft</source>
         <translation>pés</translation>
     </message>
     <message>
         <source>g</source>
         <translation>g</translation>
     </message>
     <message>
         <source>gal (US)</source>
         <translation>gal (US)</translation>
     </message>
     <message>
         <source>hectares</source>
         <translation>hectares</translation>
     </message>
     <message>
         <source>in</source>
         <translation>polegadas</translation>
     </message>
     <message>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
         <source>km</source>
         <translation>km</translation>
     </message>
     <message>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
         <source>lb</source>
         <translation>lb</translation>
     </message>
     <message>
         <source>Lg tons</source>
         <translation>ton Lg</translation>
     </message>
     <message>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
         <source>mg</source>
         <translation>mg</translation>
     </message>
     <message>
         <source>mi</source>
         <translation>mp</translation>
     </message>
     <message>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
         <source>mm</source>
         <translation>mm</translation>
     </message>
     <message>
         <source>naut. mi</source>
         <translation>mil naut</translation>
     </message>
     <message>
         <source>oz</source>
         <translation>oz</translation>
     </message>
     <message>
         <source>points</source>
         <translation>pontos</translation>
     </message>
     <message>
         <source>pt</source>
         <translation>pt</translation>
     </message>
     <message>
         <source>qt</source>
         <translation>qt</translation>
     </message>
     <message>
         <source>sq cm</source>
         <translation>cm quad</translation>
     </message>
     <message>
         <source>sq ft</source>
         <translation>pés quad</translation>
     </message>
     <message>
         <source>sq in</source>
         <translation>polegadas quad</translation>
     </message>
     <message>
         <source>sq km</source>
         <translation>km quad</translation>
     </message>
     <message>
         <source>sq m</source>
         <translation>m quad</translation>
     </message>
     <message>
         <source>sq mi</source>
         <translation>mil quad</translation>
     </message>
     <message>
         <source>sq mm</source>
         <translation>mm quad</translation>
     </message>
     <message>
         <source>sq yd</source>
         <translation>jardas quad</translation>
     </message>
     <message>
         <source>st</source>
         <translation>st</translation>
     </message>
     <message>
         <source>St tons</source>
         <translation>Ton st</translation>
     </message>
     <message>
         <source>tblspoon</source>
         <translation>tblspoon</translation>
     </message>
     <message>
         <source>teaspoons</source>
         <translation>teaspoons</translation>
     </message>
     <message>
         <source>tonnes</source>
         <translation>toneladas</translation>
     </message>
     <message>
         <source>yd</source>
         <translation>jardas</translation>
     </message>
 </context>
 </TS>
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
@@ -1,754 +1,646 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation>Despesas</translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation>Nova despesa</translation>
     </message>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation>Transações</translation>
     </message>
     <message>
         <source>Charts</source>
         <translation>Gráficos</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation>Introduza o nome da despesa aqui.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation>Escolha o tipo de despesa aqui.</translation>
     </message>
     <message>
-        <source>Savings</source>
-        <translation 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>
         <source>Enter account number for this checkbook here.</source>
         <translation>Introduza o número de conta para esta despesa.</translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation>Número PIN:</translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation>Introduza o PIN para esta despesa.</translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation>Saldo Inicial:</translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation>Introduza o saldo inicial para esta lista de despesas.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notas:</translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation>Introduza informação adicional para esta lista de despesas.</translation>
     </message>
     <message>
-        <source>Current balance: %10.00</source>
-        <translation 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>
         <source>Description</source>
         <translation>Descrição</translation>
     </message>
     <message>
         <source>Amount</source>
         <translation>Valor</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation>Clique aqui para adicionar uma transação.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation>Seleccione uma transação e clique aqui para a editar.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation>Seleccione uma transação e clique aqui para a apagar.</translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation>Seleccione o gráfico pretendido e clique no botão &quot;Gráfico&quot;.</translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation>Clique aqui para escolher o gráfico desejado.</translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation>Saldo da Conta</translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation>Levantamentos por categoria</translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation>Depósitos por categoria</translation>
     </message>
     <message>
         <source>Draw</source>
         <translation>Gráfico</translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation>Clique aqui para desenhar o gráfico seleccionado.</translation>
     </message>
     <message>
-        <source>Current balance: %1%2</source>
-        <translation type="obsolete">Saldo actual: %1%2</translation>
-    </message>
-    <message>
         <source>Delete transaction</source>
         <translation>Apagar transação</translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation>Proteger por palavra chave</translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation>Clique aqui para activar/desactivar a protecção por palavra chave.</translation>
     </message>
     <message>
         <source>Num</source>
         <translation>Num</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Introduza palavra chave</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Introduza a sua palavra chave:</translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation>Confirme palavra chave</translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation>Confirme a sua palavra chave:</translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation>Introduza a sua palavra chave para desactivar a protecção:</translation>
     </message>
     <message>
         <source>Sort by:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select checkbook sorting here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entry Order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SortDate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Balance</source>
         <translation type="unfinished">Saldo</translation>
     </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation>Configurar Despesas</translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation>Introduza o símbolo monetário:</translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation>Introduza o símbolo monetário aqui.</translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation>Mostra se as despesas estão protegidas 
 por palavra chave ou não</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
         <translation>Clique aqui para selecionar se a janela principal irá mostrar se as despesas estão protegidas por palavra chave.</translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation>Mostrar saldos das despesas</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation>Clique aqui para selecionar se a janela principal irá mostrar o saldo actual de cada lista de despesas.</translation>
     </message>
     <message>
         <source>&amp;Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Account Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Account Types</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Payees</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open last checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether the last open checkbook will be opened at startup.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show last checkbook tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save new description as payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to save new descriptions in the list of payess.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ListEdit</name>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Apagar</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation>Despesas</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation>Clique aqui para criar uma nova lista de despesas.
 
 Também pode escolher &quot;Novo&quot; no menu.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation>Seleccione uma lista de despesas e clique aqui para a editar.
 
 Também pode escolher &quot;Edit&quot; no menu, ou clicar e esperar num nome.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation>Clique aqui para apagar uma nova lista de despesas.
 
 Também pode escolher &quot;Apagar&quot; no menu.</translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation>Está é a lista de todas as listas de despesas disponíveis.</translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation>Apagar lista de despesas</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Configurar</translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation>Clique aqui para a configuração.</translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation>Nome da Despesa</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>Saldo</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Introduza palavra chave</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Introduza a sua palavra chave:</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>Date</source>
         <translation type="unfinished">Data</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Editar</translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished">Novo</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Apagar</translation>
     </message>
     <message>
         <source>Savings</source>
         <translation type="unfinished">Poupanças</translation>
     </message>
     <message>
         <source>Checking</source>
         <translation type="unfinished">Cheques</translation>
     </message>
     <message>
         <source>CD</source>
         <translation type="unfinished">CD</translation>
     </message>
     <message>
         <source>Money market</source>
         <translation type="unfinished">Mercado Monetário</translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation type="unfinished">Fundos Mútuos</translation>
     </message>
     <message>
         <source>Other</source>
         <translation type="unfinished">Outro</translation>
     </message>
     <message>
         <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation type="unfinished">Automóvel</translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="unfinished">Contas</translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="unfinished">CDs</translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="unfinished">Roupa</translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="unfinished">Informática</translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="unfinished">DVDs</translation>
     </message>
     <message>
         <source>Electronics</source>
         <translation type="unfinished">Electrónico</translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation type="unfinished">Entretenimento</translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="unfinished">Comida</translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="unfinished">Combustível</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished">Vários</translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="unfinished">Filmes</translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="unfinished">Rendas</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished">Viagens</translation>
     </message>
     <message>
         <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished">Vencimento</translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation type="unfinished">Despesas Familiares</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation type="unfinished">Créditos Diversos</translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation>Transação para</translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation>Levantamento</translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation>Seleccione se a transação é um levantamento ou um depósito aqui.</translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation>Depósito</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Data:</translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation>Seleccione a data da transação aqui.</translation>
     </message>
     <message>
         <source>Number:</source>
         <translation>Número:</translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation>Introduza o número do cheque aqui.</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Descrição:</translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation>Introduza a descrição da transação aqui.</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoria:</translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation>Seleccione a categoria da transação aqui.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation>Seleccione o tipo de transação aqui.
 
 As opções são dependentes da transação ser de levantamento ou de depósito.</translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation>Valor:</translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation>Introduza o valor da transação aqui.
 
 O valor deverá ser sempre positivo.</translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation>Taxa:</translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation>Introduza a taxa associada à transação.
 
 O valor deverá ser sempre positivo.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notas:</translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation>Introduza informação adicional para esta transação aqui.</translation>
     </message>
     <message>
-        <source>Automobile</source>
-        <translation 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
@@ -1,287 +1,206 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AlarmDlg</name>
     <message>
         <source>Clock</source>
         <translation type="unfinished">Relógio</translation>
     </message>
     <message>
         <source>Snooze</source>
         <translation type="unfinished">Toque</translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AlarmDlgBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>TextLabel1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Snooze</source>
         <translation type="unfinished">Toque</translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thu</source>
         <comment>Thursday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fri</source>
         <comment>Friday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat</source>
         <comment>Saturday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sun</source>
         <comment>Sunday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lap/Split</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Daily Alarm:&lt;/b&gt;&lt;p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily alarm requires at least
 one day to be selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished">Tudo</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished">Áudio</translation>
     </message>
 </context>
 <context>
     <name>ClockBase</name>
     <message>
         <source>Clock</source>
         <translation type="unfinished">Relógio</translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stopwatch</source>
         <translation type="unfinished">Cronómetro</translation>
     </message>
     <message>
         <source>Split</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished">Começar</translation>
     </message>
     <message>
         <source>Starts and stops the stopwatch.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lap/Split</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Resets the stopwatch.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check to enable the daily alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the hour the alarm will sound.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the minute the alarm will sound.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished">AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished">PM</translation>
     </message>
     <message>
         <source>Days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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
@@ -1,860 +1,829 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation>Calendário</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>Hoje</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dia</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Semana</translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation>Semanas</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mês</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Procurar</translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation>A duração do evento é maior que o 
 intervalo entre as repetições.</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Não pode editar os dados enquanto está a sincronizar</translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation>Editar Evento</translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation>minutos)</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Sem espaço</translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation>O calendário não conseguiu
 gravar as alterações.
 Liberte algum espaço e tente de novo.
 
 Sair na mesma?</translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation>(Desconhecido)</translation>
     </message>
     <message>
         <source>Error!</source>
         <translation>Erro!</translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation>Corrija-o</translation>
     </message>
     <message>
         <source>Continue</source>
         <translation>Continuar</translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation>Evento Duplicado</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>Editar...</translation>
     </message>
     <message>
         <source>error box</source>
         <translation>caixa de erro</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation>Se</translation>
     </message>
     <message>
         <source>T</source>
         <translation>Te</translation>
     </message>
     <message>
         <source>W</source>
         <translation>Qu</translation>
     </message>
     <message>
         <source>F</source>
         <translation>Se</translation>
     </message>
     <message>
         <source>S</source>
         <translation>Sá</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Segunda</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Terça</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Quarta</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Quinta</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Sexta</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sábado</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Domingo</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00p</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation>Início</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Fim</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Irradiar</translation>
     </message>
     <message>
         <source>This is an all day event.</source>
         <translation>O evento dura o dia todo.</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Hora</translation>
     </message>
     <message>
         <source> - </source>
         <translation>-</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplicado</translation>
     </message>
     <message>
         <source>Beam this occurence</source>
         <translation>Irradiar esta ocorrência</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation>:00 PM</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation>:00 AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Calendário</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>Preferências</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation>Início da vista de eventos</translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation>Hora de Início:</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation>Configuração do Alarme</translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation>Alarme Pré-definido</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>minutos</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Vários</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>Estilo da Linha:</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Omissão</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Médio</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Largo</translation>
     </message>
     <message>
         <source>Views</source>
         <translation>Vistas</translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation>Vista por omissão:</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dia</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Semana</translation>
     </message>
     <message>
         <source>Week List</source>
         <translation>Semanas</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mês</translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation>Ir para o dia actual</translation>
     </message>
     <message>
         <source>Time display</source>
         <translation>Mostrar o dia</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nenhum</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Início</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation>Início-Fim</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Omissão</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Morada:</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Escritório</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Casa</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoria:</translation>
     </message>
+    <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>
         <translation>w</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Jan-00. Jan</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
         <translation type="unfinished">STQQSSDS</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstEvent</name>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Editar</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished">Duplicado</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Apagar</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished">Irradiar</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>w</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>W: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation>p</translation>
     </message>
-    <message>
-        <source>Mo</source>
-        <comment>Monday</comment>
-        <translation type="obsolete">Se</translation>
-    </message>
-    <message>
-        <source>Tu</source>
-        <comment>Tuesday</comment>
-        <translation type="obsolete">Te</translation>
-    </message>
-    <message>
-        <source>We</source>
-        <comment>Wednesday</comment>
-        <translation type="obsolete">Qu</translation>
-    </message>
-    <message>
-        <source>Th</source>
-        <comment>Thursday</comment>
-        <translation type="obsolete">Qu</translation>
-    </message>
-    <message>
-        <source>Fr</source>
-        <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>
         <source>Calendar</source>
         <translation>Calendário</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>Repetir...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>Diariamente...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>Semanalmente...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>Mensalmente...</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>Anualmente...</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Sem repetição...</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>Novo Evento</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Morada</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Categoria</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Reunião</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Almoço</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Jantar</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Viagem</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Descrição</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Escritório</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Casa</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>Início - Fim</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>Jan 02 00</translation>
     </message>
     <message>
         <source>Start time</source>
         <translation type="unfinished">Hora Início</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Todo o dia</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Fuso horário</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Alarme</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>minutos</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Silencioso</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Alto</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Repetir</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Sem repetição...</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Nota...</translation>
     </message>
-    <message>
-        <source>Start Time</source>
-        <translation type="obsolete">Hora Início</translation>
-    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation>Informação</translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Editar Nota</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Almoço</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Início</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Fim</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Todos</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>todos os %1 %2</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>Todos os %1</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>Todos os %1 %1</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Todos</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Segunda</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Terça</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Quarta</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Quinta</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Sexta</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sábado</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Domingo</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation></translation>
     </message>
     <message>
         <source>nd</source>
         <translation></translation>
     </message>
     <message>
         <source>rd</source>
         <translation></translation>
     </message>
     <message>
         <source>th</source>
         <translation></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation>Sem Repetição</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>dia(s)</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>semana(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Repetir Em</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dia</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Dia</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>mês(es)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>ano(s)</translation>
     </message>
     <message>
         <source>days</source>
         <translation>dias</translation>
     </message>
     <message>
         <source>day</source>
         <translation>dia</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>semanas</translation>
     </message>
     <message>
         <source>week</source>
         <translation>semana</translation>
     </message>
     <message>
         <source>month</source>
         <translation>mês</translation>
     </message>
     <message>
         <source>year</source>
         <translation>ano</translation>
     </message>
     <message>
         <source> and </source>
         <translation>e</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
 e</translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, e</translation>
     </message>
     <message>
         <source>on </source>
         <translation>em</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Evento Repetitivo</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nenhum</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dia</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Semana</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mês</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Ano</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Todos:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Frequência</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Fim Em:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Sem Data de Fim</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Repetir Em</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Seg</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Ter</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Qua</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Qui</translation>
     </message>
     <message>
         <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>Every</source>
         <translation>Todos</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>SemanaVar</translation>
     </message>
     <message>
         <source>months</source>
         <translation>meses</translation>
     </message>
     <message>
         <source>years</source>
         <translation>anos</translation>
     </message>
 </context>
 </TS>
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
@@ -1,293 +1,249 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation>Selecção do Comando</translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation>Comandos</translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation>&lt;b&gt;Comandos&lt;/b&gt;:</translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation>&lt;b&gt;Comandos Sugeridos&lt;/b&gt;:</translation>
     </message>
 </context>
 <context>
     <name>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>
         <source>Cyan on White</source>
         <translation>Ciano em Branco</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>Branco em Ciano</translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation>Azul em Preto</translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation>Â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>
         <source>Tab</source>
         <translation>Tab</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Cima</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Baixo</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Colar</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Edição Rápida</translation>
     </message>
     <message>
-        <source>Edit</source>
-        <translation 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>
         <source>ScrollBar</source>
         <translation>Barra</translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation>Mostrar Lista</translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation>Esconder Lista</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation>Personalizado</translation>
     </message>
     <message>
         <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>
         <source>Hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Pink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pink on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>new session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sessions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To exit fullscreen, tap here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History Lines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konsole </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Selecção de Comandos</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation>Adicionar comando</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation>Comando a adicionar:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/fifteen.ts b/i18n/pt/fifteen.ts
index eb3fd39..cf16113 100644
--- a/i18n/pt/fifteen.ts
+++ b/i18n/pt/fifteen.ts
@@ -1,100 +1,96 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FifteenConfigDialog</name>
     <message>
         <source>All Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select board background</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FifteenConfigDialogBase</name>
     <message>
         <source>Configure Fifteen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use a Custom Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Path:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Preview:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Grid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Rows:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
 <context>
     <name>PiecesTable</name>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Puzzle</translation>
     </message>
     <message>
         <source>Congratulations!
 You win the game!</source>
         <translation>Parabéns! 
 Ganhou!</translation>
     </message>
     <message>
         <source>R&amp;andomize Pieces</source>
         <translation>&amp;Misturar</translation>
     </message>
     <message>
         <source>&amp;Reset Pieces</source>
         <translation>&amp;Reiniciar peças</translation>
     </message>
 </context>
 </TS>
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
@@ -1,56 +1,52 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GoMainWidget</name>
     <message>
         <source>New Game</source>
         <translation>Novo Jogo</translation>
     </message>
     <message>
         <source>Pass</source>
         <translation>Passar</translation>
     </message>
     <message>
         <source>Resign</source>
         <translation>Desistir</translation>
     </message>
     <message>
         <source>Two player option</source>
         <translation>Opções de dois jogadores</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Jogo</translation>
     </message>
 </context>
 <context>
     <name>GoWidget</name>
     <message>
         <source>White %1, Black %2. </source>
         <translation>Branco %1, Preto %2.</translation>
     </message>
     <message>
         <source>White wins.</source>
         <translation>Branco ganhou.</translation>
     </message>
     <message>
         <source>Black wins.</source>
         <translation>Preto ganhou.</translation>
     </message>
     <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
@@ -1,68 +1,64 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KBill</name>
     <message>
         <source>kBill</source>
         <translation>kBill</translation>
     </message>
     <message>
         <source>New game</source>
         <translation>Novo jogo</translation>
     </message>
     <message>
         <source>Pause game</source>
         <translation>Pausar jogo</translation>
     </message>
     <message>
         <source>Story of kBill</source>
         <translation>História do kBill</translation>
     </message>
     <message>
         <source>Rules</source>
         <translation>Regras</translation>
     </message>
     <message>
         <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>
         <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 disguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>UI</name>
     <message>
         <source>After Level</source>
         <translation>Nível Seguinte</translation>
     </message>
     <message>
         <source>Your score</source>
         <translation>Pontuação</translation>
     </message>
 </context>
 </TS>
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
@@ -1,294 +1,290 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KRFBConnection</name>
     <message>
         <source>Connected</source>
         <translation>Ligado</translation>
     </message>
     <message>
         <source>Connection Refused</source>
         <translation>Ligação Recusada</translation>
     </message>
     <message>
         <source>Host not found</source>
         <translation>Endereço não encontrado</translation>
     </message>
     <message>
         <source>Read Error: QSocket reported an error reading
 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>
         <source>Protocol Error: An unknown encoding was used by the server %1</source>
         <translation>Erro de Protocolo: o servidor %1 usou uma codificação desconhecida </translation>
     </message>
     <message>
         <source>Waiting for server initialization...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KRFBLogin</name>
     <message>
         <source>Waiting for server version...</source>
         <translation>À espera da versão do servidor...</translation>
     </message>
     <message>
         <source>Error: Invalid server version, %1</source>
         <translation>Erro: versão do servidor inválida, %1</translation>
     </message>
     <message>
         <source>Error: Unsupported server version, %1</source>
         <translation>Erro: versão do servidor não suportada, %1</translation>
     </message>
     <message>
         <source>Logged in</source>
         <translation>Autenticado em</translation>
     </message>
     <message>
         <source>Error: This server requires a password, but none has been specified.
 </source>
         <translation>Erro: este servidor necessita de palavra chave, mas não foi especificada nenhuma.
 </translation>
     </message>
     <message>
         <source>Error: The password you specified was incorrect.</source>
         <translation>Erro: a palavra chave especificada é incorrecta.</translation>
     </message>
     <message>
         <source>Error: Too many invalid login attempts have been made
 to this account, please try later.</source>
         <translation>Erro: demasiadas tentativas inválidas de autenticação 
 para esta conta, tente mais tarde.</translation>
     </message>
     <message>
         <source>Login Failed</source>
         <translation>Autenticação Falhou</translation>
     </message>
     <message>
         <source>Too many failures</source>
         <translation>Demasiadas falhas de autenticação</translation>
     </message>
 </context>
 <context>
     <name>KVNC</name>
     <message>
         <source>VNC Viewer</source>
         <translation>Cliente VNC</translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation>Ecrâ Todo</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>Desligar</translation>
     </message>
     <message>
         <source>Stop Full Screen</source>
         <translation>Sair de Ecrâ Todo</translation>
     </message>
     <message>
         <source>Connected to remote host</source>
         <translation>Ligar ao servidor remoto</translation>
     </message>
     <message>
         <source>Logged in to remote host</source>
         <translation>Ligado ao servidor remoto</translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation>Ligação terminada</translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation>Nova Ligação</translation>
     </message>
     <message>
         <source>Open Bookmark</source>
         <translation>Abrir Atalho</translation>
     </message>
     <message>
         <source>Delete Bookmark</source>
         <translation>Apagar Atalho</translation>
     </message>
     <message>
         <source>Send Contrl-Alt-Delete</source>
         <translation>Enviar Control-Alt-Del</translation>
     </message>
     <message>
         <source>Next Click is Double Click</source>
         <translation>Próximo Clique é Duplo Clique</translation>
     </message>
     <message>
         <source>Next Click is Right Click</source>
         <translation>Próximo Clique é Clique Direito</translation>
     </message>
 </context>
 <context>
     <name>KVNCBookmarkDlgBase</name>
     <message>
         <source>Bookmarks</source>
         <translation>Atalhos</translation>
     </message>
     <message>
         <source>Choose a bookmark that you would like to open</source>
         <translation>Escolha o atalho que deseja abrir</translation>
     </message>
 </context>
 <context>
     <name>KVNCConnDlgBase</name>
     <message>
         <source>VNC Viewer Connection</source>
         <translation>Ligação do Cliente VNC</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Servidor</translation>
     </message>
     <message>
         <source>Show Password</source>
         <translation>Mostrar palavra Chave</translation>
     </message>
     <message>
         <source>Password:</source>
         <translation>Palavra Chave:</translation>
     </message>
     <message>
         <source>Bookmark Name:</source>
         <translation>Nome do Atalho:</translation>
     </message>
     <message>
         <source>Host Name:</source>
         <translation>Servidor:</translation>
     </message>
     <message>
         <source>Display Number:</source>
         <translation>Número do Ecrâ:</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opções</translation>
     </message>
     <message>
         <source>Check for screen updates every:</source>
         <translation>Actualizar ecrâ cada:</translation>
     </message>
     <message>
         <source>Milliseconds</source>
         <translation>Mili-segundos</translation>
     </message>
     <message>
         <source>Request 8-bit session</source>
         <translation>Pedir sessão de 256 cores</translation>
     </message>
     <message>
         <source>Raise on bell</source>
         <translation>Primeiro Plano quando tocar</translation>
     </message>
     <message>
         <source>Request shared session</source>
         <translation>Pedir sessão partilhada</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>Scale Factor</source>
         <translation>Factor de Escala</translation>
     </message>
     <message>
         <source>Encodings</source>
         <translation>Codificações</translation>
     </message>
     <message>
         <source>Hextile encoding</source>
         <translation>Codificação &quot;Hextile&quot;</translation>
     </message>
     <message>
         <source>CoRRE encoding</source>
         <translation>Codificação &quot;CoRRE&quot;</translation>
     </message>
     <message>
         <source>RRE encoding</source>
         <translation>Codificação &quot;RRE&quot;</translation>
     </message>
     <message>
         <source>Copy rectangle encoding</source>
         <translation>Codificação &quot;Copy Rectangle&quot;</translation>
     </message>
     <message>
         <source>The password of the VNC server</source>
         <translation>A palavra chave do servidor VNC</translation>
     </message>
     <message>
         <source>Toggle obscuring the password</source>
         <translation>Esconder/mostrar a palavra chave</translation>
     </message>
     <message>
         <source>The name of the VNC server</source>
         <translation>O nome do servidor VNC</translation>
     </message>
     <message>
         <source>The host name of the VNC server</source>
         <translation>O nome de rede do servidor VNC </translation>
     </message>
     <message>
         <source>The display number of the VNC server</source>
         <translation>O número de ecrâ do servidor VNC</translation>
     </message>
     <message>
         <source>Delay between requesting updates from the server</source>
         <translation>Intervalo de actualização </translation>
     </message>
     <message>
         <source>Request that the VNC server transfer 8 bit color</source>
         <translation>Usa apenas 256 cores</translation>
     </message>
     <message>
         <source>Allow other users to connect to the VNC server</source>
         <translation>Permite várias ligações simultâneas ao servidor VNC</translation>
     </message>
     <message>
         <source>Scale the remote display to fit on the PDA (Slow)</source>
         <translation>Escalar o ecrâ remoto para caber no ecrâ do dispositivo (lento)</translation>
     </message>
     <message>
         <source>Enable transmiting identical rectangles as references to existing data</source>
         <translation>Activar a transmissão de rectangulos semelhantes como referência dos dados existentes</translation>
     </message>
 </context>
 </TS>
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
@@ -1,286 +1,278 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DocTabSettings</name>
     <message>
         <source>Enable the Documents Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check, if you want the Documents Tab to be visible.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputMethodSettings</name>
     <message>
         <source>Resize application on Popup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable floating and resizing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check, if you want the application to be automatically resized if the input method pops up.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check, if you want to move and/or resize input methods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Specify the percentage of the screen width for the input method</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherSettings</name>
     <message>
         <source>Launcher Settings</source>
         <translation>Configurações da Lista de Aplicações</translation>
     </message>
     <message>
         <source>Taskbar</source>
         <translation>Barra Principal</translation>
     </message>
     <message>
         <source>O-Menu</source>
         <translation>Menu Principal</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Pastas</translation>
     </message>
     <message>
         <source>InputMethods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MenuSettings</name>
     <message>
         <source>Load applets in O-Menu:</source>
         <translation>Ler aplicações especiais no menu principal:</translation>
     </message>
     <message>
         <source>Show Launcher tabs in O-Menu</source>
         <translation>Mostrar pastas de aplicações no menu principal</translation>
     </message>
     <message>
         <source>Check the applets that you want to have included in the O-Menu.</source>
         <translation>Seleccione as aplicações especiais que quer incluidas no menu principal.</translation>
     </message>
     <message>
         <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
         <translation>Adiciona as pastas de aplicações ao menu principal.</translation>
     </message>
     <message>
         <source>Show Applications in Subpopups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Sample 1</source>
         <translation>Exemplo 1</translation>
     </message>
     <message>
         <source>Sample 2</source>
         <translation>Exemplo 2</translation>
     </message>
     <message>
         <source>Sample 3</source>
         <translation>Exemplo 3</translation>
     </message>
 </context>
 <context>
     <name>TabDialog</name>
     <message>
         <source>Edit Tab</source>
         <translation>Editar Pasta</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>Fundo</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Fonte</translation>
     </message>
     <message>
         <source>Icons</source>
         <translation>Icones</translation>
     </message>
     <message>
         <source>Previewing %1</source>
         <translation>A mostrar previsão %1</translation>
     </message>
     <message>
         <source>This is a rough preview of what the currently selected Tab will look like.</source>
         <translation>Esta é uma precisão simples do formato de pastas seleccionado.</translation>
     </message>
     <message>
         <source>Use a custom font</source>
         <translation>Usar uma fonte personalizada</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
         <source>Ruled</source>
         <translation>Riscas</translation>
     </message>
     <message>
         <source>Solid color</source>
         <translation>Cor</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Imagem</translation>
     </message>
     <message>
         <source>Select...</source>
         <translation>Seleccione...</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Omissão</translation>
     </message>
     <message>
         <source>Size:</source>
         <translation>Tamanho:</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Pequena</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Grande</translation>
     </message>
     <message>
         <source>Color:</source>
         <translation>Cor:</translation>
     </message>
     <message>
         <source>Columns:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatic</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TabsSettings</name>
     <message>
         <source>Launcher Tabs:</source>
         <translation>Pastas de Aplicações:</translation>
     </message>
     <message>
         <source>foobar</source>
         <translation>foobar</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nova</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Enable big busy indicator</source>
         <translation>Activar indicador grande ao iniciar uma aplicação</translation>
     </message>
     <message>
-        <source>Enable blinking busy indicator</source>
-        <translation 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>
         <source>Not implemented yet</source>
         <translation>Por implementar</translation>
     </message>
     <message>
         <source>Enable animated busy indicator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Activate this, if you want an animatedbusy indicator for starting applications in the Launcher.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable static background pixmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Activate this, if you want the background pixmap not to scroll with the icons.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskbarSettings</name>
     <message>
         <source>Load applets in Taskbar:</source>
         <translation>Carregar aplicações especiais na barra principal:</translation>
     </message>
     <message>
         <source>Check the applets that you want displayed in the Taskbar.</source>
         <translation>Seleccione as aplicações especiais que deseja ver na barra principal.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/libbatteryapplet.ts b/i18n/pt/libbatteryapplet.ts
index 88a3abc..bc6b816 100644
--- a/i18n/pt/libbatteryapplet.ts
+++ b/i18n/pt/libbatteryapplet.ts
@@ -1,114 +1,86 @@
 <!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>
         <source>Very Low</source>
         <translation>Muito Baixo</translation>
     </message>
     <message>
         <source>Critical</source>
         <translation>Crítico</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Desconhecido</translation>
     </message>
     <message>
         <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>
         <source>Remaing Power: %1 %2
 Remaining Time: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ipaq  %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,27 +1,17 @@
 <!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>
 </TS>
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,1496 +1,1416 @@
 <!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>
     </message>
     <message>
         <source>New Account</source>
         <translation>Nova Conta</translation>
     </message>
     <message>
         <source>Edit Account: </source>
         <translation>Editar Conta:</translation>
     </message>
     <message>
         <source>Dial</source>
         <translation>Ligar</translation>
     </message>
     <message>
         <source>Edit Login Script</source>
         <translation>Editar script da ligação</translation>
     </message>
     <message>
         <source>Authentication</source>
         <translation>Autenticação</translation>
     </message>
     <message>
         <source>IP Setup</source>
         <translation>Configurar IP</translation>
     </message>
     <message>
         <source>IP</source>
         <translation>IP</translation>
     </message>
     <message>
         <source>Gateway Setup</source>
         <translation>Configurar Gateway</translation>
     </message>
     <message>
         <source>Gateway</source>
         <translation>Gateway</translation>
     </message>
     <message>
         <source>DNS Servers</source>
         <translation>Configurar DNS</translation>
     </message>
     <message>
         <source>DNS</source>
         <translation>DNS</translation>
     </message>
     <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>
         <source>PAP</source>
         <translation>PAP</translation>
     </message>
     <message>
         <source>Terminal-based</source>
         <translation>Baseado em terminal</translation>
     </message>
     <message>
         <source>CHAP</source>
         <translation>CHAP</translation>
     </message>
     <message>
         <source>PAP/CHAP</source>
         <translation>PAP/CHAP</translation>
     </message>
     <message>
         <source>&lt;p&gt;Specifies the method used to identify yourself to
 the PPP server. Most universities still use
 &lt;b&gt;Terminal&lt;/b&gt;- or &lt;b&gt;Script&lt;/b&gt;-based authentication,
 while most ISP use &lt;b&gt;PAP&lt;/b&gt; and/or &lt;b&gt;CHAP&lt;/b&gt;. If
 unsure, contact your ISP.
 
 If you can choose between PAP and CHAP,
 choose CHAP, because it&apos;s much safer. If you don&apos;t know
 whether PAP or CHAP is right, choose PAP/CHAP.</source>
         <translation>&lt;p&gt;Especifica o método a usar para ser identificado na 
 ligação. As universidades usam geralmente autenticação
 baseada em terminal ou script, mas a maioria dos ISP&apos;s 
 usam PAP ou CHAP. Em caso de dúvida, contacte o seu ISP.
 
 Se puder escolher entre PAP e CHAP, escolha CHAP porque
 é mais seguro. Se não souber qual a escolher, tente 
 PAP/CHAP.
 </translation>
     </message>
     <message>
         <source>Username: </source>
         <translation>Utilizador:</translation>
     </message>
     <message>
         <source>Enter your username here...</source>
         <translation>Introduza o utilizador aqui...</translation>
     </message>
     <message>
         <source>Password: </source>
         <translation>Palavra Chave:</translation>
     </message>
     <message>
         <source>Enter your password here</source>
         <translation>Introduza a palavra chave aqui</translation>
     </message>
     <message>
         <source>Store password</source>
         <translation>Guardar palavra chave</translation>
     </message>
     <message>
         <source>&lt;p&gt;When this is turned on, your ISP password
 will be saved in &lt;i&gt;kppp&lt;/i&gt;&apos;s config file, so
 you do not need to type it in every time.
 
 &lt;b&gt;&lt;font color=&quot;red&quot;&gt;Warning:&lt;/font&gt; your password will be stored as
 plain text in the config file, which is
 readable only to you. Make sure nobody
 gains access to this file!</source>
         <translation>&lt;p&gt;Se activar esta opção, a palavra chave será 
 guardada no ficheiro de configuração do 
 &lt;i&gt;kppp&lt;/i&gt;, para que não a tenha de introduzir 
 sempre que liga.
 
 &lt;b&gt;Atenção: a palavra chave será guardada em 
 texto, e só pode ser lida por si!</translation>
     </message>
     <message>
         <source>error</source>
         <translation>erro</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Login script has unbalanced loop Start/End&lt;qt&gt;</source>
         <translation>&lt;qt&gt;O script de ligação tem um erro nos Start e End&lt;/qt&gt;</translation>
     </message>
 </context>
 <context>
     <name>ChooserWidget</name>
     <message>
         <source>&amp;Edit...</source>
         <translation>&amp;Editar...</translation>
     </message>
     <message>
         <source>&amp;New...</source>
         <translation>&amp;Novo...</translation>
     </message>
     <message>
         <source>Co&amp;py</source>
         <translation>Co&amp;piar</translation>
     </message>
     <message>
         <source>De&amp;lete</source>
         <translation>&amp;Apagar</translation>
     </message>
 </context>
 <context>
     <name>DNSWidget</name>
     <message>
         <source>Domain name:</source>
         <translation>Nome do domínio:</translation>
     </message>
     <message>
         <source>If you enter a domain name here, this domain
 name is used for your computer while you are
 connected. When the connection is closed, the
 original domain name of your computer is
 restored.
 
 If you leave this field blank, no changes are
 made to the domain name.</source>
         <translation>Se escolher um nome de domínio aqui, será usado
 enquanto estiver ligado. Ao desligar, será reposto o 
 nome de domínio anterior.</translation>
     </message>
     <message>
         <source>Configuration:</source>
         <translation>Configuração:</translation>
     </message>
     <message>
         <source>Automatic</source>
         <translation>Automática</translation>
     </message>
     <message>
         <source>Manual</source>
         <translation>Manual</translation>
     </message>
     <message>
         <source>DNS IP address:</source>
         <translation>Endereço IP do DNS:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Allows you to specify a new DNS server to be
 used while you are connected. When the
 connection is closed, this DNS entry will be
 removed again.
 
 To add a DNS server, type in the IP address of
 the DNS server here and click on &lt;b&gt;Add&lt;/b&gt;</source>
         <translation>&lt;p&gt;Permite-lhe escolher um servidor DNS a ser
 usado durante a ligação. Quando a ligação for 
 terminada, a entrada do DNS será removida.
 
 Para adicionar um servidor DNS, introduza aqui o 
 endereço IP e clique em &lt;b&gt;Adicionar&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Adicionar</translation>
     </message>
     <message>
         <source>Click this button to add the DNS server
 specified in the field above. The entry
 will then be added to the list below</source>
         <translation>Clique aqui para adicionar o servidor 
 DNS especificado no campo acima. 
 A entrada será adicionada na lista abaixo </translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Remover</translation>
     </message>
     <message>
         <source>Click this button to remove the selected DNS
 server entry from the list below</source>
         <translation>Clique neste botão para remover o servidor DNS 
 selecionado na lista abaixo</translation>
     </message>
     <message>
         <source>DNS address list:</source>
         <translation>Lista de endereços DNS:</translation>
     </message>
     <message>
         <source>&lt;p&gt;This shows all defined DNS servers to use
 while you are connected. Use the &lt;b&gt;Add&lt;/b&gt; and
 &lt;b&gt;Remove&lt;/b&gt; buttons to modify the list</source>
         <translation>&lt;p&gt;Aqui serão mostrados os servidores DNS a serem
 usados durante a ligação. Use a opção &lt;b&gt;Adicionar&lt;/b&gt;
 e &lt;b&gt;Remover&lt;/b&gt; para modificar a lista</translation>
     </message>
     <message>
         <source>Disable DNS servers during connection</source>
         <translation>Desactivar servidores DNS durante a ligação</translation>
     </message>
     <message>
         <source>&lt;p&gt;When this option is selected, all DNS
 servers specified in &lt;tt&gt;/etc/resolv.conf&lt;/tt&gt; are
 temporary disabled while the dialup connection
 is established. After the connection is
 closed, the servers will be re-enabled
 
 Typically, there is no reason to use this
 option, but it may become useful under 
 some circumstances.</source>
         <translation>&lt;p&gt;Quando esta opção for selecionada, todos os 
 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>
     </message>
     <message>
         <source>New Device</source>
         <translation>Novo Dispositivo</translation>
     </message>
     <message>
         <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>
         <translation>Cria uma cópia do dispositivo selecionado. 
 Serão copiadas todas as configurações para o
 novo, que poderão ser modificadas</translation>
     </message>
     <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;Apaga a conta selecionada&lt;/p&gt;</translation>
     </message>
     <message>
         <source>You must enter a unique device name</source>
         <translation>O nome do dispositivo tem de ser único</translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished">Erro</translation>
     </message>
 </context>
 <context>
     <name>DialWidget</name>
     <message>
         <source>Connection name:</source>
         <translation>Nome da ligação:</translation>
     </message>
     <message>
         <source>Type in a unique name for this connection</source>
         <translation>Escolha um nome unico para esta ligação</translation>
     </message>
     <message>
         <source>Phone number:</source>
         <translation>Número de telefone:</translation>
     </message>
     <message>
         <source>&amp;Add...</source>
         <translation>&amp;Adicionar...</translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation>&amp;Remover</translation>
     </message>
     <message>
         <source>&lt;p&gt;Specifies the phone numbers to dial. You
 can supply multiple numbers here, simply
 click on &quot;Add&quot;. You can arrange the
 order the numbers are tried by using the
 arrow buttons.
 
 When a number is busy or fails, &lt;i&gt;kppp&lt;/i&gt; will 
 try the next number and so on</source>
         <translation>&lt;p&gt;Especifique o número de telefone a ligar.
 Poderá escolher vários números, bastando 
 adicioná-los na opçao &quot;Adiciona&quot;. Pode 
 ordená-los com as setas.
 
 Quando um número está ocupado, o &lt;i&gt;kppp&lt;/i&gt;
 irá tentar o número seguinte</translation>
     </message>
     <message>
         <source>Customize pppd Arguments...</source>
         <translation>Personalizar os argumentos do pppd...</translation>
     </message>
 </context>
 <context>
     <name>ExecWidget</name>
     <message>
         <source>Here you can select commands to run at certain stages of the connection. The commands are run with your real user id, so you cannot run any commands here requiring root permissions (unless, of course, you are root).&lt;br&gt;&lt;br&gt;Be sure to supply the whole path to the program otherwise we might be unable to find it.</source>
         <translation>Aqui poderá escolher os comandos a executar em determinadas fases da ligação. Estes comandos serão executados com o seu utilizador, portanto não poderá executar comandos que necessitem de permissões de &quot;root&quot; (a menos que seja root, obviamente).&lt;br&gt;&lt;br&gt;Certifique-se que introduz o caminho completo para o programa para garantir que ele é encontrado.</translation>
     </message>
     <message>
         <source>Before connect:</source>
         <translation>Antes de ligar:</translation>
     </message>
     <message>
         <source>Allows you to run a program &lt;b&gt;before&lt;/b&gt; a connection
 is established. It is called immediately before
 dialing has begun.
 
 This might be useful, e.g. to stop HylaFAX blocking the
 modem.</source>
         <translation>Permite a execução de um programa &lt;b&gt;antes&lt;/b&gt; da ligação
 ser estabelecida. Será executada imediatamente antes da
 ligação propriamente dita.</translation>
     </message>
     <message>
         <source>Upon connect:</source>
         <translation>Depois de ligar:</translation>
     </message>
     <message>
         <source>Allows you to run a program &lt;b&gt;after&lt;/b&gt; a connection
 is established. When your program is called, all
 preparations for an Internet connection are finished.
 
 Very useful for fetching mail and news</source>
         <translation>Permite a execução de um programa &lt;b&gt;depois&lt;/b&gt; da ligação
 ser estabelecida. Será executada quando a ligação à Internet 
 estiver concluída.
 
 Pode ser usado por examplo para aceder automaticamente ao mail </translation>
     </message>
     <message>
         <source>Before disconnect:</source>
         <translation>Antes de desligar:</translation>
     </message>
     <message>
         <source>Allows you to run a program &lt;b&gt;before&lt;/b&gt; a connection
 is closed. The connection will stay open until
 the program exits.</source>
         <translation>Permite a execução de um programa &lt;b&gt;antes&lt;/b&gt; da ligação
 ser terminada. A ligação será mantida até que este programa
 termine.</translation>
     </message>
     <message>
         <source>Upon disconnect:</source>
         <translation>Depois de desligar:</translation>
     </message>
     <message>
         <source>Allows you to run a program &lt;b&gt;after&lt;/b&gt; a connection
 has been closed.</source>
         <translation>Permite a execução de um programa &lt;b&gt;depois&lt;/b&gt; da 
 ligação ser fechada.</translation>
     </message>
 </context>
 <context>
     <name>GatewayWidget</name>
     <message>
         <source>Configuration</source>
         <translation>Configuração</translation>
     </message>
     <message>
         <source>Default gateway</source>
         <translation>Gateway por omissão</translation>
     </message>
     <message>
         <source>This makes the PPP peer computer (the computer
 you are connected to with your modem) to act as
 a gateway. Your computer will send all packets not
 going to a computer inside your local net to this
 computer, which will route these packets.
 
 This is the default for most ISPs, so you should
 probably leave this option on.</source>
         <translation>Esta opção irá usar o seu ISP como Gateway para 
 todos os pacotes que não sejam da sua rede local.
 
 Isto é o usual para a maioria dos ISP&apos;s, portanto é 
 recomendado que active esta opção.</translation>
     </message>
     <message>
         <source>Static gateway</source>
         <translation>Gateway estática</translation>
     </message>
     <message>
         <source>&lt;p&gt;Allows you to specify which computer you want
 to use as gateway (see &lt;i&gt;Default Gateway&lt;/i&gt; above)</source>
         <translation>&lt;p&gt;Permite especificar qual o IP que deseja usar como
 Gateway (veja &lt;i&gt;Gateway por omissão&lt;/i&gt; acima)</translation>
     </message>
     <message>
         <source>Gateway IP address:</source>
         <translation>Endereço IP da Gateway:</translation>
     </message>
     <message>
         <source>Assign the default route to this gateway</source>
         <translation>Assigna este IP como Gateway</translation>
     </message>
     <message>
         <source>If this option is enabled, all packets not
 going to the local net are routed through
 the PPP connection.
 
 Normally, you should turn this on</source>
         <translation>Se esta opção estiver activa, todos os pacotes
 que não sejam para a rede local serão routeados
 através da ligação PPP.
 
 Normalmente deverá activar esta opção</translation>
     </message>
 </context>
 <context>
     <name>IPWidget</name>
     <message>
         <source>Configuration</source>
         <translation>Configuração</translation>
     </message>
     <message>
         <source>Dynamic IP address</source>
         <translation>Endereço IP dinâmico</translation>
     </message>
     <message>
         <source>Select this option when your computer gets an
 internet address (IP) every time a
 connection is made.
 
 Almost every Internet Service Provider uses
 this method, so this should be turned on.</source>
         <translation>Escolha esta opção para que o seu dispositivo
 receba um IP do seu ISP quando é estabelecida
 uma ligação.
 
 Practicamente todos os ISP&apos;s usam este método,
 portanto é recomendado activar esta opção.</translation>
     </message>
     <message>
         <source>Static IP address</source>
         <translation>Endereço IP estático</translation>
     </message>
     <message>
         <source>Select this option when your computer has a
 fixed internet address (IP). Most computers
 don&apos;t have this, so you should probably select
 dynamic IP addressing unless you know what you
 are doing.</source>
         <translation>Escolha esta opção quando desejar fixar o seu
 IP. Na maioria dos casos, é o ISP que envia o seu
 IP, portanto active esta opção apenas se tiver a 
 certeza do que está a fazer.</translation>
     </message>
     <message>
         <source>IP address:</source>
         <translation>Endereço IP:</translation>
     </message>
     <message>
         <source>If your computer has a permanent internet
 address, you must supply your IP address here.</source>
         <translation>Se o seu dispositivo tiver uma IP fixo, introduza-o
 aqui.</translation>
     </message>
     <message>
         <source>Subnet mask:</source>
         <translation>Máscara da sub-rede:</translation>
     </message>
     <message>
         <source>&lt;p&gt;If your computer has a static Internet address,
 you must supply a network mask here. In almost
 all cases this netmask will be &lt;b&gt;255.255.255.0&lt;/b&gt;,
 but your mileage may vary.
 
 If unsure, contact your Internet Service Provider</source>
         <translation>&lt;p&gt;Se o seu dispositivo tiver um endereço IP fixo, 
 deverá introduzir uma máscara de rede aqui. Na maioria
 dos casos, será &lt;b&gt;255.255.255.0&lt;/b&gt;.
 
 Em caso de dúvida, consulte o seu ISP</translation>
     </message>
     <message>
         <source>Auto-configure hostname from this IP</source>
         <translation>Configurar automaticamente o nome para este IP</translation>
     </message>
     <message>
         <source>&lt;p&gt;Whenever you connect, this reconfigures
 your hostname to match the IP address you
 got from the PPP server. This may be useful
 if you need to use a protocol which depends
 on this information, but it can also cause several
 &lt;a href=&quot;kppp-7.html#autohostname&quot;&gt;problems&lt;/a&gt;.
 
 Don&apos;t enable this unless you really need it.</source>
         <translation>&lt;p&gt;Quando efectuar a ligação, esta opção irá
 reconfigurar o nome do dispositivo para que 
 corresponda ao IP recebido na ligação.
 Isto poderá ser útil no caso de usar um protocolo
 que dependa desta informação, mas também
 poderá causar vários problemas.
 
 Não active esta opção a menos que precise dela.</translation>
     </message>
     <message>
         <source>Selecting this option might cause some weird problems with the X-server and applications while kppp is connected. Don&apos;t use it until you know what you are doing!
 For more information take a look at the handbook (or help) in the section &quot;Frequently asked questions&quot;.</source>
         <translation>A escolha desta opção poderá causar vários problemas estranhos com o servidor X ou outras aplicações durante a ligação. Não a use a menos que tenha a certeza do que está a fazer.</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Atenção</translation>
     </message>
 </context>
 <context>
     <name>InterfacePPP</name>
     <message>
         <source>No password</source>
         <translation>Sem palavra chave</translation>
     </message>
     <message>
         <source>Username defined but no password
  Please enter a password</source>
         <translation>Palavra chave vazia, tem de introduzir uma</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
 </context>
 <context>
     <name>ModemTransfer</name>
     <message>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
 </context>
 <context>
     <name>ModemWidget</name>
     <message>
         <source>Modem &amp;name:</source>
         <translation>&amp;Nome do Modem:</translation>
     </message>
     <message>
         <source>Modem de&amp;vice:</source>
         <translation>Dispositi&amp;vo do Modem:</translation>
     </message>
     <message>
         <source>This specifies the serial port your modem is attached 
 to. On Linux/x86, typically this is either /dev/ttyS0 
 (COM1 under DOS) or /dev/ttyS1 (COM2 under DOS).
 
 If you have an internal ISDN card with AT command
 emulation (most cards under Linux support this), you
 should select one of the /dev/ttyIx devices.</source>
         <translation>Aqui deverá especificar a porta série onde o seu modem
 está instalado. No Linux/x86, o nome é tipicamente 
 /dev/ttyS0 (COM1 no DOS) ou /dev/ttyS1 (COM2 no DOS).
 
 Se possuir uma carta ISDN interna com emulação de
 comandos AT (a maioria das cartas suportam isto em Linux), 
 deverá ter um nome do estilo /dev/ttyIx.</translation>
     </message>
     <message>
         <source>&amp;Flow control:</source>
         <translation>Controlo de &amp;Flow:</translation>
     </message>
     <message>
         <source>Hardware [CRTSCTS]</source>
         <translation>Hardware [CRTSCTS]</translation>
     </message>
     <message>
         <source>Software [XON/XOFF]</source>
         <translation>Software [XON/XOFF]</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nenhum</translation>
     </message>
     <message>
         <source>&lt;p&gt;Specifies how the serial port and modem
 communicate. You should not change this unless
 you know what you are doing.
 
 &lt;b&gt;Default&lt;/b&gt;: CRTSCTS</source>
         <translation>&lt;p&gt;Especifica o controlo de &quot;Flow&quot; entre a porta
 série e o modem. Não deverá alterar este valor a
 menos que saiba o que está a fazer.
 
 &lt;b&gt;Omissão&lt;/b&gt;: CRTSCTS</translation>
     </message>
     <message>
         <source>&amp;Line termination:</source>
         <translation>Terminação de &amp;linha:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Specifies how AT commands are sent to your
 modem. Most modems will work fine with the
 default &lt;i&gt;CR/LF&lt;/i&gt;. If your modem does not react
 to the init string, you should try different
 settings here
 
 &lt;b&gt;Default&lt;/b&gt;: CR/LF</source>
         <translation>&lt;p&gt;Especifica quais os caracteres de terminação de linha
 a serem enviados para o seu modem. A maioria dos modems
 funcionam correctamente com o valor por omissão &lt;i&gt;CR/LF&lt;/i&gt;.
 Se o seu modem não reagir correctamente à string de inicialização,
 tente valores diferentes aqui
 
 &lt;b&gt;Omissão&lt;/b&gt;: CR/LF</translation>
     </message>
     <message>
         <source>Co&amp;nnection speed:</source>
         <translation>&amp;Velocidade de ligação:</translation>
     </message>
     <message>
         <source>Specifies the speed your modem and the serial
 port talk to each other. You should begin with
 the default of 38400 bits/sec. If everything
 works you can try to increase this value, but to
 no more than 115200 bits/sec (unless you know
 that your serial port supports higher speeds).</source>
         <translation>Especifica a velocidade entre o modem e a porta série.
 Deverá começar por tentar o valor por omissão de 38.400 
 bits/seg. Se funcionar, tente aumentar o valor até ao 
 máximo de 115.200 bits/sec, a menos que a sua porta
 série e o modem suportem velocidades mais elevadas.</translation>
     </message>
     <message>
         <source>&amp;Use lock file</source>
         <translation>&amp;Usar ficheiro de bloqueio</translation>
     </message>
     <message>
         <source>&lt;p&gt;To prevent other programs from accessing the
 modem while a connection is established, a
 file can be created to indicate that the modem
 is in use. On Linux an example file would be
 &lt;tt&gt;/var/lock/LCK..ttyS1&lt;/tt&gt;
 Here you can select whether this locking will
 be done.
 
 &lt;b&gt;Default&lt;/b&gt;: On</source>
         <translation>&lt;p&gt;Para evitar que vários programas usem a porta
 série quando estiver a decorrer uma ligação, poderá ser
 criado um ficheiro de bloqueio que indicará que o 
 modem está a ser usado. Num sistema Linux, o ficheiro
 será da forma &lt;tt&gt;/var/lock/LCK..ttySx&lt;/tt&gt;.
 Aqui poderá activar ou desactivar o uso desse ficheiro.
 
 &lt;b&gt;Omissão&lt;/b&gt;: Ligado</translation>
     </message>
     <message>
         <source>Modem timeout:</source>
         <translation>Tempo de inactividade da ligação:</translation>
     </message>
     <message>
         <source> sec</source>
         <translation>seg</translation>
     </message>
     <message>
         <source>This specifies how long &lt;i&gt;kppp&lt;/i&gt; waits for a
 &lt;i&gt;CONNECT&lt;/i&gt; response from your modem. The
 recommended value is 30 seconds.</source>
         <translation>Aqui pode especificar o tempo de espera por uma resposta
 de &lt;i&gt;CONNECT&lt;/i&gt; vinda do modem. O valor recomendado
 é de 30 segundos.</translation>
     </message>
 </context>
 <context>
     <name>ModemWidget2</name>
     <message>
         <source>Busy wait:</source>
         <translation>Ocupado:</translation>
     </message>
     <message>
         <source>&amp;Wait for dial tone before dialing</source>
         <translation>&amp;Esperar por sinal de ligação antes de ligar</translation>
     </message>
     <message>
         <source>&lt;p&gt;Normally the modem waits for a dial tone
 from your phone line, indicating that it can
 start to dial a number. If your modem does not
 recognize this sound, or your local phone system
 does not emit such a tone, uncheck this option
 
 &lt;b&gt;Default:&lt;/b&gt;: On</source>
         <translation>&lt;p&gt;Normalmente, o modem espera que haja um sinal 
 de ligação na linha telefónica, indicando que é possível
 começar a marcação do número. Se o seu modem não 
 reconhecer o sinal ou no caso do sistema telefónico não
 disponibilizar esse sinal, desactive esta opção.
 
 &lt;b&gt;Omissão&lt;/b&gt;: Ligado
 </translation>
     </message>
     <message>
         <source> sec</source>
         <translation>seg</translation>
     </message>
     <message>
         <source>Specifies the number of seconds to wait before
 redial if all dialed numbers are busy. This is
 necessary because some modems get stuck if the
 same number is busy too often.
 
 The default is 0 seconds, you should not change
 this unless you need to.</source>
         <translation>Especifica o número de segundos a esperar antes de
 voltar a tentar ligar no caso de todos os números estarem
 ocupados. Esta opção é necessária devido a alguns modems
 ficarem encravados no caso de um número estar ocupado
 muitas vezes.
 
 O valor por omissão é de 0 segundos, e não deverá alterar
 a menos que precise.</translation>
     </message>
     <message>
         <source>Modem &amp;volume:</source>
         <translation>&amp;Volume do Modem:</translation>
     </message>
     <message>
         <source>Most modems have a speaker which makes
 a lot of noise when dialing. Here you can
 either turn this completely off or select a
 lower volume.
 
 If this does not work for your modem,
 you must modify the modem volume command.</source>
         <translation>A maioria dos modems têm uma coluna que fará
 muito barulho ao estabelecer a ligação. Aqui poderá
 desactivar esse som ou dimimuir o volume dele.
 
 Se esta opção não funcionar com o seu modem, 
 deverá alterar o comando de configuração do volume.</translation>
     </message>
     <message>
         <source>Modem asserts CD line</source>
         <translation>Modem verifica a linha CD</translation>
     </message>
     <message>
         <source>This controls how &lt;i&gt;kppp&lt;/i&gt; detects that the modem
 is not responding. Unless you are having
 problems with this, do not modify this setting.
 
 &lt;b&gt;Default&lt;/b&gt;: Off</source>
         <translation>Isto controla a forma do &lt;i&gt;kppp&lt;/i&gt; detectar se o modem
 não está a responder. A menos que tenha problemas com esta
 opção, não deverá alterá-la.
 
 &lt;b&gt;Omissão&lt;/b&gt;: Desligada</translation>
     </message>
     <message>
         <source>Mod&amp;em Commands...</source>
         <translation>Comandos do Mod&amp;em...</translation>
     </message>
     <message>
         <source>Allows you to change the AT command for
 your modem.</source>
         <translation>Permite alterar os comandos AT para o seu
 modem.</translation>
     </message>
     <message>
         <source>&amp;Query Modem...</source>
         <translation>&amp;Questionar o Modem...</translation>
     </message>
     <message>
         <source>Most modems support the ATI command set to
 find out vendor and revision of your modem.
 
 Press this button to query your modem for
 this information. It can be useful to help
 you setup the modem</source>
         <translation>A maioria dos modems suportam os comandos ATI para
 questionar a marca, model e versão do seu modem.
 
 Use esta opção para questionar esta informação ao seu 
 modem. Esta informação poderá ser útil para configurar
 o seu modem</translation>
     </message>
 </context>
 <context>
     <name>PPPConfigWidget</name>
     <message>
         <source>Configure Modem</source>
         <translation>Configurar Modem</translation>
     </message>
     <message>
         <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>
         <translation>Argumentos:</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Adicionar</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Remover</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Por Omissão</translation>
     </message>
 </context>
 <context>
     <name>PhoneNumberDialog</name>
     <message>
         <source>Add Phone Number</source>
         <translation>Adicionar Número de Telefone</translation>
     </message>
     <message>
         <source>Enter a phone number:</source>
         <translation>Introduza o número de telefone:</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>PPP</source>
         <translation>PPP</translation>
     </message>
     <message>
         <source>generic ppp device</source>
         <translation>dispositivo ppp genérico</translation>
     </message>
     <message>
         <source>Unable to open modem.</source>
         <translation>Não foi possível aceder ao modem.</translation>
     </message>
     <message>
         <source>Unable to detect state of CD line.</source>
         <translation>Não foi possível detectar o estado da linha CD.</translation>
     </message>
     <message>
         <source>The modem is not ready.</source>
         <translation>O modem não está pronto.</translation>
     </message>
     <message>
         <source>The modem is busy.</source>
         <translation>O modem está ocupado.</translation>
     </message>
     <message>
         <source>Modem Ready.</source>
         <translation>Modem Pronto.</translation>
     </message>
     <message>
         <source>Can&apos;t restore tty settings: tcsetattr()
 </source>
         <translation>Não foi possível restaurar as configurações do tty: tcsetattr()
 </translation>
     </message>
     <message>
         <source>The modem does not respond.</source>
         <translation>O modem não está a responder.</translation>
     </message>
     <message>
         <source>Unknown speed</source>
         <translation>Velocidade desconhecida</translation>
     </message>
     <message>
         <source>ATI Query</source>
         <translation>Questionar ATI</translation>
     </message>
     <message>
         <source>Unable to create modem lock file.</source>
         <translation>Não foi possível criar o ficheiro de bloqueio do modem.</translation>
     </message>
     <message>
         <source>Looking for modem...</source>
         <translation>A procurar o modem...</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
         <source>Modem Query timed out.</source>
         <translation>Expirou o tempo para questionar o modem.</translation>
     </message>
     <message>
         <source>Modem device is locked.</source>
         <translation>O dispositivo do modem está bloqueado.</translation>
     </message>
     <message>
         <source>Modem Ready</source>
         <translation>Modem Pronto</translation>
     </message>
     <message>
         <source>One moment please...</source>
         <translation>Um momento...</translation>
     </message>
     <message>
         <source>Modem Query Results</source>
         <translation>Resultados do Questionário ao Modem</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Fechar</translation>
     </message>
     <message>
         <source>You&apos;re not allowed to dial out with kppp.
 Contact your system administrator.</source>
         <translation>Não tem permissões para fazer uma ligação 
 através do kppp. Contacte o seu administrador.</translation>
     </message>
     <message>
         <source>Cannot find the PPP daemon!
 Make sure that pppd is installed.</source>
         <translation>Não foi possível encontrar o processo de PPP!
 Certifique-se que tem o pppd instalado.</translation>
     </message>
     <message>
         <source>You do not have the permission to start pppd!
 Contact your system administrator and ask to get access to pppd.</source>
         <translation>Não tem permissões para executar o pppd!
 Contacte o seu administrador e peça acesso ao pppd.</translation>
     </message>
     <message>
         <source>You don&apos;t have sufficient permission to run
 %1
 Please make sure that kppp is owned by root and has the SUID bit set.</source>
         <translation>Não tem permissões suficiente para executar
 %1
 Certifique-se que o kppp é do root e tem o bit de SUID activado.</translation>
     </message>
     <message>
         <source>%1 is missing or can&apos;t be read!
 Ask your system administrator to create this file (can be empty) with appropriate read and write permissions.</source>
         <translation>Não foi encontrado ou não é possível ler %1!
 Peça ao administrador para criar este ficheiro (mesmo que seja vazio) com as permissões de leitura e escrita correctas.</translation>
     </message>
     <message>
         <source>Edit Modem Commands</source>
         <translation>Editar Comandos do Modem</translation>
     </message>
     <message>
         <source>Pre-init delay (sec/100):</source>
         <translation>Espera antes da inicialização (seg/100):</translation>
     </message>
     <message>
         <source>Initialization string %1:</source>
         <translation>String de inicialização %1:</translation>
     </message>
     <message>
         <source>Post-init delay (sec/100):</source>
         <translation>Espera depois da inicialização (seg/100):</translation>
     </message>
     <message>
         <source>Dialing speed (sec/100):</source>
         <translation>Velocidade de marcação (seg/100):</translation>
     </message>
     <message>
         <source>Init response:</source>
         <translation>Resposta da inicialização:</translation>
     </message>
     <message>
         <source>No dial tone detection:</source>
         <translation>Deteção de falta de sinal de ligação:</translation>
     </message>
     <message>
         <source>Dial string:</source>
         <translation>String de marcação:</translation>
     </message>
     <message>
         <source>Connect response:</source>
         <translation>Resposta ao ligar:</translation>
     </message>
     <message>
         <source>Busy response:</source>
         <translation>Resposta se ocupado:</translation>
     </message>
     <message>
         <source>No carrier response:</source>
         <translation>Resposta se não tiver ligação:</translation>
     </message>
     <message>
         <source>No dial tone response:</source>
         <translation>Resposta se não tiver sinal de marcar:</translation>
     </message>
     <message>
         <source>Hangup string:</source>
         <translation>String para desligar:</translation>
     </message>
     <message>
         <source>Hangup response:</source>
         <translation>Resposta ao desligar:</translation>
     </message>
     <message>
         <source>Answer string:</source>
         <translation>String para atender:</translation>
     </message>
     <message>
         <source>Ring response:</source>
         <translation>Resposta se tocar:</translation>
     </message>
     <message>
         <source>Answer response:</source>
         <translation>Resposta se atender:</translation>
     </message>
     <message>
         <source>Escape string:</source>
         <translation>String de escape:</translation>
     </message>
     <message>
         <source>Escape response:</source>
         <translation>Resposta de escape:</translation>
     </message>
     <message>
         <source>Guard time (sec/50):</source>
         <translation>Tempo de salvaguarda (seg/50):</translation>
     </message>
     <message>
         <source>Volume off/low/high:</source>
         <translation>Volume desligado/baixo/alto:</translation>
     </message>
     <message>
         <source>Connected at:</source>
         <translation>Ligado a:</translation>
     </message>
     <message>
         <source>Time connected:</source>
         <translation>Tempo ligado:</translation>
     </message>
     <message>
         <source>Volume:</source>
         <translation>Volume:</translation>
     </message>
     <message>
         <source>Session Bill:</source>
         <translation>Valor da sessão:</translation>
     </message>
     <message>
         <source>Total Bill:</source>
         <translation>Valor total:</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>Desligar</translation>
     </message>
     <message>
         <source>Byte</source>
         <translation>Byte</translation>
     </message>
     <message>
         <source>KB</source>
         <translation>KB</translation>
     </message>
     <message>
         <source>MB</source>
         <translation>MB</translation>
     </message>
     <message>
         <source>GB</source>
         <translation>GB</translation>
     </message>
     <message>
         <source>Connecting to: </source>
         <translation>A ligar a:</translation>
     </message>
     <message>
         <source>Online</source>
         <translation>Ligado</translation>
     </message>
     <message>
         <source>Offline</source>
         <translation>Desligado</translation>
     </message>
     <message>
         <source>Log</source>
         <translation>Log</translation>
     </message>
     <message>
         <source>Connecting to: %1</source>
         <translation>A ligar a: %1</translation>
     </message>
     <message>
         <source>Running pre-startup command...</source>
         <translation>A executar o comando de pre-início...</translation>
     </message>
     <message>
         <source>Initializing modem...</source>
         <translation>A inicializar o modem...</translation>
     </message>
     <message>
         <source>Setting </source>
         <translation>Configuração</translation>
     </message>
     <message>
         <source>Setting speaker volume...</source>
         <translation>A configurar o volume da coluna...</translation>
     </message>
     <message>
         <source>Turning off dial tone waiting...</source>
         <translation>A desligar o volume da coluna...</translation>
     </message>
     <message>
         <source>Dialing %1</source>
         <translation>A ligar a %1</translation>
     </message>
     <message>
         <source>Line busy. Hanging up...</source>
         <translation>Linha ocupada, a desligar...</translation>
     </message>
     <message>
         <source>Line busy. Waiting: %1 seconds</source>
         <translation>Linha ocupada, a esperar %1 segundos</translation>
     </message>
     <message>
         <source>No Dialtone</source>
         <translation>Sem sinal</translation>
     </message>
     <message>
         <source>No Carrier</source>
         <translation>Sem ligação</translation>
     </message>
     <message>
         <source>Scanning %1</source>
         <translation>A procurar %1</translation>
     </message>
     <message>
         <source>Saving %1</source>
         <translation>A gravar %1</translation>
     </message>
     <message>
         <source>Sending %1</source>
         <translation>A enviar %1</translation>
     </message>
     <message>
         <source>Expecting %1</source>
         <translation>À espera de %1</translation>
     </message>
     <message>
         <source>Pause %1 seconds</source>
         <translation>À espera %1 segundos</translation>
     </message>
     <message>
         <source>Timeout %1 seconds</source>
         <translation>Tempo de espera %1 segundos</translation>
     </message>
     <message>
         <source>Hangup</source>
         <translation>Desligar</translation>
     </message>
     <message>
         <source>Answer</source>
         <translation>Atender</translation>
     </message>
     <message>
         <source>ID %1</source>
         <translation>ID %1</translation>
     </message>
     <message>
         <source>Password %1</source>
         <translation>Palavra Chave %1</translation>
     </message>
     <message>
         <source>Prompting %1</source>
         <translation>A pedir %1</translation>
     </message>
     <message>
         <source>PW Prompt %1</source>
         <translation>A pedir palavra chave %1</translation>
     </message>
     <message>
         <source>Loop Start %1</source>
         <translation>Início de ciclo %1</translation>
     </message>
     <message>
         <source>ERROR: Nested too deep, ignored.</source>
         <translation>Erro: ciclo demasiado longo, ignorado.</translation>
     </message>
     <message>
         <source>Loops nested too deeply!</source>
         <translation>Os ciclos são demasiado longos!</translation>
     </message>
     <message>
         <source>Loop End %1</source>
         <translation>Fim de Ciclo %1</translation>
     </message>
     <message>
         <source>LoopEnd without matching Start! Line: %1</source>
         <translation>Fim de Ciclo sem início na linha %1</translation>
     </message>
     <message>
         <source>Starting pppd...</source>
         <translation>A iniciar o pppd...</translation>
     </message>
     <message>
         <source>Scan Var: %1</source>
         <translation>Procurar variável: %1</translation>
     </message>
     <message>
         <source>Found: %1</source>
         <translation>Encontrado: %1</translation>
     </message>
     <message>
         <source>Looping: %1</source>
         <translation>Em ciclo: %1</translation>
     </message>
     <message>
         <source>Script timed out!</source>
         <translation>Expirou o tempo de espera do script!</translation>
     </message>
     <message>
         <source>Scanning: %1</source>
         <translation>A procurar: %1</translation>
     </message>
     <message>
         <source>Expecting: %1</source>
         <translation>À espera de: %1</translation>
     </message>
     <message>
         <source>Logging on to network...</source>
         <translation>A ligar à rede...</translation>
     </message>
     <message>
         <source>Running startup command...</source>
         <translation>A executar o comando de inicialização...</translation>
     </message>
     <message>
         <source>Done</source>
         <translation>Feito</translation>
     </message>
     <message>
         <source>pppd command + command-line arguments exceed 2024 characters in length.</source>
         <translation>o comando pppd e os seus argumentos excedem o máximo de 1024 caractéres.</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Cannot find the PPP daemon!&lt;br&gt;Make sure that pppd is installed and that you have entered the correct path.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Não foi possível encontrar o comando PPP!&lt;br&gt;Certifique-se que o executável pppd está instalado e na directoria correcta.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Cannot execute:&lt;br&gt; %1&lt;br&gt;Please make sure that you have given setuid permission and that pppd is executable.&lt;br&gt;</source>
         <translation>&lt;qt&gt;Não foi possível executar:&lt;br&gt; %1&lt;br&gt;Certifique-se que o pppd está executável e tem as permissões e o bit de SUID correctos.&lt;br&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Cannot find:&lt;br&gt; %1&lt;br&gt;Please make sure you have setup your modem device properly and/or adjust the location of the modem device on the modem tab of the setup dialog.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Não foi possível encontrar:&lt;br&gt; %1&lt;br&gt;Certifique-se que a configuração do modem está correcta.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;You have selected the authentication method PAP or CHAP. This requires that you supply a username and a password!&lt;/qt&gt;</source>
         <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>
     </message>
 </context>
 </TS>
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,1170 +1,727 @@
 <!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>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished">Semana</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished">Mês</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished">Ano</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished">Todos:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished">Frequência</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished">Termina Em:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">Sem Data de Término</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">Seg</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">Ter</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">Qua</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">Qui</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">Sex</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">Sáb</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">Dom</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">Todos</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished">Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished">SemanaVar</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">Sem Data de Término</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished">dias</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished">dia</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished">semanas</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished">semana</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished">meses</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished">mês</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished">anos</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished">ano</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished">e</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished">,
 e</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished">, e</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished">em</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished">Sem Repetição</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished">dia(s)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">Seg</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">Ter</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">Qua</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">Qui</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">Sex</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">Sáb</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">Dom</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished">semana(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished">Repetir Por</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">Dia</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Data</translation>
     </message>
     <message>
         <source>month(s)</source>
         <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>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to edit the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to duplicate the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to delete the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to transmit the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</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">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>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Prazo:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoria:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation>E-Mail por Omissão:</translation>
     </message>
     <message>
-        <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
-        <translation type="obsolete">&lt;b&gt;Endereço Trabalho:&lt;/b&gt; </translation>
-    </message>
-    <message>
         <source>Office: </source>
         <translation>Emprego:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Site Web Emprego:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Telefone Emprego:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Fax Emprego:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Telemóvel Emprego:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Pager Emprego:</translation>
     </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>
         <source>Home Mobile: </source>
         <translation>Telemóvel Pessoal:</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation>Todos os E-Mails:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Profissão:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Assistente:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Gestor:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Masculino</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Feminino</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Género:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Esposa:</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Data Nascimento:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Aniversário:</translation>
     </message>
     <message>
         <source>Children: </source>
         <translation>Filhos:</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Alcunha:</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notas:</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation>Início:</translation>
     </message>
     <message>
         <source>End:</source>
         <translation>Fim:</translation>
     </message>
     <message>
         <source>Note:</source>
         <translation>Nota:</translation>
     </message>
     <message>
         <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>
         <source>Wednesday</source>
         <translation>Quarta</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Quinta</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Sexta</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sábado</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Domingo</translation>
     </message>
     <message>
-        <source>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>
         <source>Low</source>
         <translation>Baixo</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation>Muito Baixo</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Localização:</translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation>Este é um evento para o dia todo</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation>Este é um evento para vários dias</translation>
     </message>
     <message>
-        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
-        <translation 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>
         <source>User Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profession</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Has a due-date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No due-date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No reccurrence</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No start-date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No completed-date</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation></translation>
     </message>
     <message>
         <source>nd</source>
         <translation></translation>
     </message>
     <message>
         <source>rd</source>
         <translation></translation>
     </message>
     <message>
         <source>th</source>
         <translation></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/libopieui2.ts b/i18n/pt/libopieui2.ts
index 02965c7..dde0edd 100644
--- a/i18n/pt/libopieui2.ts
+++ b/i18n/pt/libopieui2.ts
@@ -1,826 +1,175 @@
 <!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>
     </message>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished">Nome</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished">Tamanho</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Data</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished">Tipo de Conteúdo</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished">DiálogoFicheiro</translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished">Abrir</translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished">Gravar</translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished">Nome:</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation type="unfinished">Estilo</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished">Tamanho</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished">A Rápida Raposa Castanha Salta Sobre O Cão Molenga</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="unfinished">Nome</translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished"></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="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>
 </TS>
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
@@ -1,1046 +1,998 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation>Todas</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Vazio</translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation>(multi.)</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Emprego</translation>
     </message>
     <message>
         <source>Personal</source>
         <translation>Pessoal</translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation>(Multi.)</translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation>Todas</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>Nova Categoria</translation>
     </message>
     <message>
         <source>New Category </source>
         <translation>Nova Categoria</translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation>Editar Categoria</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>Categorias</translation>
     </message>
     <message>
         <source>Application</source>
         <translation>Aplicação</translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation>Categorias Aqui</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Adicionar</translation>
     </message>
     <message>
         <source>Global</source>
         <translation>Global</translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation>Escolha as categorias para este documento.</translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation>Introduza uma categoria nova aqui. Prima &lt;b&gt;Adicionar&lt;/b&gt; para adicionar à lista.</translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation>Introduza uma nova categoria e prima &quot;Adicionar&quot; para a adicionar à lista.</translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation>Prima para apagar a categoria selecionada.</translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation>Active para marcar esta propriedade como disponível a todas as aplicações.</translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation>Todas</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Vazio</translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation>Há outra aplicação a editar
 as categorias.</translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation>Editar Categorias</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todas</translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation>Mostrar Janeiro no ano selecionado</translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation>Mostrar o mês anterior</translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation>Mostrar o mês seguinte</translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation>Mostrar Dezembro no ano selecionado</translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation>Fechar o Selector de Ficheiros</translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation>Mostar documentos deste tipo</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Vista de Documentos</translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation>Mostrar documentos nesta categoria</translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation>Clique para selecionar um documento da lista</translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation>, ou selecione &lt;b&gt;Novo Documento&lt;/b&gt; para criar um documento novo.</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation>&lt;br&gt;&lt;br&gt;Clique e espere para as propriedades do documento.</translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <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>
         <source>Find what:</source>
         <translation>Procurar o quê:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoria:</translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation>Iniciar Procura em:</translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation>Dez 02 01</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Sensível a letra grande/pequena</translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation>Procurar para trás</translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Document View</source>
         <translation>Vista de Documentos</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation>Falhou a remoção do ficheiro.</translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation>Copia de</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplicar</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>Falhou a cópia do ficheiro.</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Detalhes</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>Falhou ao mover o documento.</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Disco</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Propriedades</translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation>Detalhes</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>Comentário:</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Localização:</translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation>Carregamento rápido (consome mais memória)</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copia</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Irradiar</translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation>O sítio onde o documento reside.</translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation>O nome deste documento.</translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation>Pre-carrega a aplicação para que esteja disponível instantaneamente.</translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation>Apagar este documento.</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation>Fazer uma cópia do documento.</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation>Irradiar este documento para outro dispositivo.</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation>Usar rotação personalizada</translation>
     </message>
     <message>
         <source>Arguments:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>Informação do Proprietário</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Password</translation>
     </message>
 </context>
 <context>
     <name>QMessageBox</name>
     <message>
         <source>Yes</source>
         <translation>Sim</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Não</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Sem Espaço</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>Houve um problema ao criar
 a informação de configuração 
 para este programa.
 
 Liberte algum espaço e tente
 novamente.</translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation>Não foi possível criar os ficheiros
 de inicialização.
 
 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>
         <source>year</source>
         <translation>ano</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todos</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Vazio</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Endereço (Emprego):&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Endereço (Pessoal):&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation>Endereços de Correio:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Telefone (Pessoal):</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Fax (Pessoal):</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Telemóvel (Pessoal):</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>WebSite (Pessoal):</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>WebSite (Emprego):</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Escritório:</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>Profession: </source>
         <translation>Profissão:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Assistente:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Chefe:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Masculino</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Feminino</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Sexo:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Esposa:</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Nascimento:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Aniversário:</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Alcunha:</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Título (Pessoal)</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Nome</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Nome do Meio</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Apelido</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Sufixo</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Ficheiro Como</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Título (Emprego)</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Departamento</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Empresa</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>Default Email</source>
         <translation>EMail Principal</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>Outros EMails</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Telefone (Pessoal)</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Fax (Pessoal)</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Telemóvel (Pessoal)</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Endereço (Emprego)</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Cidade (Emprego)</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>Estado (Emprego)</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>Cód. Postal (Emprego)</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>País (Emprego)</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Pager (Emprego)</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>WebSite (Emprego)</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Escritório</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Profissão</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Assistente</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Chefe</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Endereço (Pessoal)</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Cidade (Pessoal)</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>Estado (Pessoal)</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>Cód. Postal (Pessoal)</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>País (Pessoal)</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>WebSite (Pessoal)</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Esposa</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Sexo</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Nascimento</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Aniversário</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Alcunha</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Filhos</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Grupos</translation>
     </message>
     <message>
         <source>New Document</source>
         <translation>Novo Documento</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Seg</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Ter</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Qua</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Qui</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
         <source>Feb</source>
         <translation>Fev</translation>
     </message>
     <message>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
         <source>Apr</source>
         <translation>Abr</translation>
     </message>
     <message>
         <source>May</source>
         <translation>Mai</translation>
     </message>
     <message>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
         <source>Aug</source>
         <translation>Ago</translation>
     </message>
     <message>
         <source>Sep</source>
         <translation>Set</translation>
     </message>
     <message>
         <source>Oct</source>
         <translation>Out</translation>
     </message>
     <message>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
         <source>Dec</source>
         <translation>Dez</translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation 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>
     <message>
         <source>%1 document</source>
         <translation>documento %1</translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation type="unfinished">Clique para fechar esta janela, perdendo as alterações.</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation type="unfinished">Clique para fechar esta janela.</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation type="unfinished">Clique para fechar esta janela e aplicar as alterações.</translation>
     </message>
     <message>
         <source>Click to make this window movable.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
         <translation type="unfinished">Clique para maximizar esta janela para o todo o ecrâ disponível.</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maximize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>Cartão CF</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Disco</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>Cartão SD</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>Disco SCSI</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Armazenamento Interno</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>Memória Interna</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>Cartão MMC</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>Nenhum</translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation>O executável dos Fusos Horários não foi encontrado</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation>Para poder mudar de fuso horário terá
 de instalar a aplicação.</translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Sem Espaço</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Não foi possível gravar os dados do alarme.
 Liberte algum espaço e tente novamente</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>ficheiros %1</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>%1 %2</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>Todos os ficheiros %1</translation>
     </message>
     <message>
         <source>All files</source>
         <translation>Todos os ficheiros</translation>
     </message>
 </context>
 <context>
     <name>WindowDecoration</name>
     <message>
         <source>Default</source>
         <comment>List box text for default window decoration</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,114 +1,102 @@
 <!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>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation>Esta cor será usada para mostrar nascimentos e aniversários!</translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation>Mostrar a cor
 urgente se abaixo</translation>
     </message>
     <message>
         <source> days: </source>
         <translation>dias:</translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation>Esta cor urgente será usada se estiver perto de um evento!</translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation>Esta cor urgente será usada se estiver a menos de x dias de um nascimento ou aniversário!</translation>
     </message>
     <message>
         <source>Enable/Disable Views</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show &amp;Birthdays</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show &amp;Anniveraries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The next birthdays will just be shown, if enabled!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The next anniversaries will just be shown, if enabled !</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>AddressBook plugin</source>
         <translation>Extra de Contactos</translation>
     </message>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>Nascimentos nos próximos &lt;b&gt;%1&lt;/b&gt; dias:</translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>Nenhum nascimento nos próximos &lt;b&gt;%1&lt;/b&gt; dias!</translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>Aniversários nos próximos &lt;b&gt;%1&lt;/b&gt; dias:</translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>Nenhum aniversário nos próximos &lt;b&gt;%1&lt;/b&gt; dias!</translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation>Não foi possível aceder à base de dados. Actualize a biblioteca do Opie!&lt;br&gt;</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/libtodaydatebookplugin.ts b/i18n/pt/libtodaydatebookplugin.ts
index 487369c..05b6ed9 100644
--- a/i18n/pt/libtodaydatebookplugin.ts
+++ b/i18n/pt/libtodaydatebookplugin.ts
@@ -1,146 +1,87 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <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>
     </message>
     <message>
         <source>Show notes</source>
         <translation>Mostrar notas</translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
         <translation>Active isto se quiser ver a nota associada a cada marcação</translation>
     </message>
     <message>
         <source>Show only later appointments</source>
         <translation>Mostrar próximas marcações</translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
         <translation>Active isto se quiser ver apenas as próximas marcações</translation>
     </message>
     <message>
         <source>Show time in extra line</source>
         <translation>Mostrar tempo numa linha extra</translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
         <translation>Qual o máximo de marcações a mostrar em ordem temporal</translation>
     </message>
     <message>
         <source>How many appointment should be shown?</source>
         <translation>Quantas marcações serão mostradas?</translation>
     </message>
     <message>
         <source>only today</source>
         <translation>apenas hoje</translation>
     </message>
     <message>
         <source>How many more days should be in the range</source>
         <translation>Quantos dias mais deverão estar disponíveis</translation>
     </message>
     <message>
         <source>How many more days</source>
         <translation>Quantos dias mais</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Datebook plugin</source>
         <translation>Extra de Marcações</translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation>Sem mais marcações para hoje</translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation>Sem marcações para hoje</translation>
     </message>
 </context>
 </TS>
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
@@ -1,59 +1,40 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>Todolist plugin</source>
         <translation>Resumo das Tarefas</translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation>Existe &lt;b&gt; 1&lt;/b&gt; tarefa activa: &lt;br&gt;</translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation>Existem &lt;b&gt; %1&lt;/b&gt; tarefas activas: &lt;br&gt;</translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation>Sem tarefas activas</translation>
     </message>
 </context>
 <context>
     <name>TodoPluginConfigBase</name>
     <message>
         <source>Set the maximum number of task that should be shown</source>
         <translation>Número máximo de tarefas a mostrar</translation>
     </message>
     <message>
         <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
@@ -1,121 +1,117 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>Weather plugin</source>
         <translation>Extra Meteorológico</translation>
     </message>
 </context>
 <context>
     <name>WeatherPluginConfig</name>
     <message>
         <source>Enter ICAO location identifier:</source>
         <translation>Introduza o identificador de localização ICAO:</translation>
     </message>
     <message>
         <source>Enter the 4 letter code for the desired location here.  See http://www.nws.noaa.gov/tg/siteloc.shtml to find a location near you.</source>
         <translation>Introduza o código de quatro letras para a localização aqui. Consulte http://www.nws.noaa.gov/tg/siteloc.shtml para descobrir uma localização perto de si.</translation>
     </message>
     <message>
         <source>Visit http://www.nws.noaa.gov/tg/siteloc.shtml to find the nearest location.</source>
         <translation>Consulte http://www.nws.noaa.gov/tg/siteloc.shtml para descobrir uma localização perto de si.</translation>
     </message>
     <message>
         <source>Use metric units</source>
         <translation>Usar unidades métricas</translation>
     </message>
     <message>
         <source>Click here to select type of units displayed.</source>
         <translation>Clique aqui para escolher o tipo de unidades a mostrar.</translation>
     </message>
     <message>
         <source>Update frequency (in minutes):</source>
         <translation>Frequência de actualização (em minutos):</translation>
     </message>
     <message>
         <source>Select how often (in minutes) you want the weather to be updated.</source>
         <translation>Selecione o intervalo de actualização (em minutos) dos dados do tempo.</translation>
     </message>
 </context>
 <context>
     <name>WeatherPluginWidget</name>
     <message>
         <source>Retreiving current weather information.</source>
         <translation>A obter a informação meteorológica actual.</translation>
     </message>
     <message>
         <source>Temp: </source>
         <translation>Temp:</translation>
     </message>
     <message>
         <source>  Wind: </source>
         <translation>Vento:</translation>
     </message>
     <message>
         <source>
 Pres: </source>
         <translation>
 Pressão:</translation>
     </message>
     <message>
         <source>Current weather data not available.</source>
         <translation>Dados meteorológicos actuais não estão disponíveis.</translation>
     </message>
     <message>
         <source>n/a</source>
         <translation>n/a</translation>
     </message>
     <message>
         <source>E </source>
         <translation>E</translation>
     </message>
     <message>
         <source>NE </source>
         <translation>NE</translation>
     </message>
     <message>
         <source>N </source>
         <translation>N</translation>
     </message>
     <message>
         <source>NW </source>
         <translation>NO</translation>
     </message>
     <message>
         <source>W </source>
         <translation>O</translation>
     </message>
     <message>
         <source>SW </source>
         <translation>SO</translation>
     </message>
     <message>
         <source>S </source>
         <translation>S</translation>
     </message>
     <message>
         <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
@@ -1,48 +1,36 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MindBreaker</name>
     <message>
         <source>New Game</source>
         <translation>Novo Jogo</translation>
     </message>
     <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>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
 </context>
 </TS>
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,37 +1,33 @@
 <!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>
         <source>Game</source>
         <translation>Jogo</translation>
     </message>
     <message>
         <source>Mine Sweep</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,88 +1,49 @@
 <!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>
         <source>Image:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -410,523 +410,503 @@
     <message>
         <source>Device</source>
         <translation>Dispositivo</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Configure Profiles</source>
         <translation>Configuração de Perfis</translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation>Nova Ligação</translation>
     </message>
     <message>
         <source>Save Connection</source>
         <translation>Gravar Ligação</translation>
     </message>
     <message>
         <source>Connect</source>
         <translation>Ligar</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>Desligar</translation>
     </message>
     <message>
         <source>QuickLaunch</source>
         <translation>Execução Rápida</translation>
     </message>
     <message>
         <source>The shell button launches the &quot;default&quot; profile. If there is none default values are taken</source>
         <translation>O botão da concha lança o perfil por omissão. Se não existir nenhum, serão usados os valores por omissão</translation>
     </message>
     <message>
         <source>Transfer file...</source>
         <translation>Transferir ficheiro...</translation>
     </message>
     <message>
         <source>Line wrap</source>
         <translation>Quebrar linha</translation>
     </message>
     <message>
         <source>Full screen</source>
         <translation>Ecrâ Todo</translation>
     </message>
     <message>
         <source>Save history</source>
         <translation>Gravar histórico</translation>
     </message>
     <message>
         <source>Terminate</source>
         <translation>Terminar</translation>
     </message>
     <message>
         <source>Close Window</source>
         <translation>Fechar Janela</translation>
     </message>
     <message>
         <source>Run Script</source>
         <translation>Executar Script</translation>
     </message>
     <message>
         <source>Record Script</source>
         <translation>Gravar Script</translation>
     </message>
     <message>
         <source>Save Script</source>
         <translation>Gravar Script</translation>
     </message>
     <message>
         <source>Open Keyboard...</source>
         <translation>Abrir Teclado...</translation>
     </message>
     <message>
         <source>New from Profile</source>
         <translation>Novo a partir do Perfil</translation>
     </message>
     <message>
         <source>Connection</source>
         <translation>Ligação</translation>
     </message>
     <message>
         <source>Scripts</source>
         <translation>Scripts</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Colar</translation>
     </message>
     <message>
         <source>Script</source>
         <translation>Script</translation>
     </message>
     <message>
         <source>&lt;qt&gt;There is no Connection.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Não existe ligação.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>History</source>
         <translation>Histórico</translation>
     </message>
     <message>
         <source>New Profile</source>
         <translation>Novo Perfil</translation>
     </message>
     <message>
         <source>Save Profile</source>
         <translation>Gravar Perfil</translation>
     </message>
     <message>
         <source>Start log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Log</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModemConfigWidget</name>
     <message>
         <source>Modem is attached to:</source>
         <translation>O modem está ligado a:</translation>
     </message>
     <message>
         <source>Enter telefon number here:</source>
         <translation>Introduza o número de telefone aqui:</translation>
     </message>
     <message>
         <source>AT commands</source>
         <translation>Comandos AT</translation>
     </message>
     <message>
         <source>Enter number</source>
         <translation>Introduza número</translation>
     </message>
 </context>
 <context>
     <name>NoOptions</name>
     <message>
         <source>This Plugin does not support any configurations</source>
         <translation>Este extra não suporta nenhuma configuração</translation>
     </message>
 </context>
 <context>
     <name>ProfileEditorDialog</name>
     <message>
         <source>Connection</source>
         <translation>Ligação</translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
         <source>Auto connect after load</source>
         <translation>Ligar automaticamente ao iniciar</translation>
     </message>
     <message>
         <source>Local Console</source>
         <translation>Consola Local</translation>
     </message>
     <message>
         <source>New Profile</source>
         <translation>Novo Perfil</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Opie Console</source>
         <translation>Consola Opie </translation>
     </message>
     <message>
         <source>Failed</source>
         <translation>Falhou</translation>
     </message>
     <message>
         <source>Connecting failed for this session.</source>
         <translation>A ligação falhou para esta sessão.</translation>
     </message>
     <message>
         <source>Session failed</source>
         <translation>Falhou a sessão</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Cannot open session: Not all components were found.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Não foi possível abrir a sessão: faltam componentes.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Transfer mode</source>
         <translation>Modo de transferência</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Enviar</translation>
     </message>
     <message>
         <source>Receive</source>
         <translation>Receber</translation>
     </message>
     <message>
         <source>Send file</source>
         <translation>Enviar ficheiro</translation>
     </message>
     <message>
         <source>Transfer protocol</source>
         <translation>Protocolo de Transferência</translation>
     </message>
     <message>
         <source>Progress</source>
         <translation>Progresso</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Estado</translation>
     </message>
     <message>
         <source>Ready</source>
         <translation>Preparado</translation>
     </message>
     <message>
         <source>Start transfer</source>
         <translation>Iniciar transferência</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
         <source>File transfer</source>
         <translation>Transferir ficheiro</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation>Atenção</translation>
     </message>
     <message>
         <source>No file has been specified.</source>
         <translation>Não foi especificado nenhum ficheiro.</translation>
     </message>
     <message>
         <source>Sending...</source>
         <translation>A enviar...</translation>
     </message>
     <message>
         <source>Receiving...</source>
         <translation>A receber...</translation>
     </message>
     <message>
         <source>Cancelled</source>
         <translation>Cancelado</translation>
     </message>
     <message>
         <source>The file transfer has been cancelled.</source>
         <translation>A transferência do ficheiro foi cancelada.</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
         <source>Operation not supported.</source>
         <translation>Operação não suportada.</translation>
     </message>
     <message>
         <source>Transfer could not be started.</source>
         <translation>Não foi possível iniciar a transferência.</translation>
     </message>
     <message>
         <source>No error.</source>
         <translation>Nenhum erro.</translation>
     </message>
     <message>
         <source>Undefined error occured.</source>
         <translation>Ocorreu um erro indefinido.</translation>
     </message>
     <message>
         <source>Incomplete transfer.</source>
         <translation>Transferência incompleta.</translation>
     </message>
     <message>
         <source>Unknown error occured.</source>
         <translation>Ocorreu um erro desconhecido.</translation>
     </message>
     <message>
         <source>Sent</source>
         <translation>Enviado</translation>
     </message>
     <message>
         <source>File has been sent.</source>
         <translation>O ficheiro foi enviado.</translation>
     </message>
     <message>
         <source>Received</source>
         <translation>Recebido</translation>
     </message>
     <message>
         <source>File has been received.</source>
         <translation>O ficheiro foi recebido.</translation>
     </message>
     <message>
         <source>Profile name</source>
         <translation>Nome do perfil</translation>
     </message>
     <message>
         <source>Profile</source>
         <translation>Perfil</translation>
     </message>
     <message>
         <source>Connection</source>
         <translation>Ligação</translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
         <source>Special Keys</source>
         <translation>Teclas Especiais</translation>
     </message>
     <message>
         <source>Invalid profile</source>
         <translation>Perfil inválido</translation>
     </message>
     <message>
         <source>Please enter a profile name.</source>
         <translation>Introduza um nome para o perfil.</translation>
     </message>
     <message>
         <source>Z-Modem</source>
         <translation>Z-Modem</translation>
     </message>
     <message>
         <source>Y-Modem</source>
         <translation>Y-Modem</translation>
     </message>
     <message>
         <source>X-Modem</source>
         <translation>X-Modem</translation>
     </message>
     <message>
         <source>Serial</source>
         <translation>Série</translation>
     </message>
     <message>
         <source>Modem</source>
         <translation>Modem</translation>
     </message>
     <message>
         <source>Local Console</source>
         <translation>Consola Local</translation>
     </message>
     <message>
         <source>Default Terminal</source>
         <translation>Terminal por Omissão</translation>
     </message>
     <message>
         <source>Default Keyboard</source>
         <translation>Teclado por Omissão</translation>
     </message>
     <message>
         <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>
         <source>Reset speakers</source>
         <translation>Iniciar Colunas</translation>
     </message>
     <message>
         <source>Turning off dialtone</source>
         <translation>A desligar o tom de ligação</translation>
     </message>
     <message>
         <source>Dial number</source>
         <translation>Ligar ao número</translation>
     </message>
     <message>
         <source>Line busy, redialing number</source>
         <translation>Número ocupado, a remarcar</translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation>Ligação estabelecida</translation>
     </message>
     <message>
         <source>Dismiss</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Dialing the number failed.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fixing up Embedix</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SerialConfigWidget</name>
     <message>
         <source>Device</source>
         <translation>Dispositivo</translation>
     </message>
 </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>
         <source>Options</source>
         <translation>Opções</translation>
     </message>
     <message>
         <source>Local echo</source>
         <translation>Eco local</translation>
     </message>
     <message>
         <source>Line wrap</source>
         <translation>Quebra de linha</translation>
     </message>
     <message>
         <source>VT 100</source>
         <translation>VT 100</translation>
     </message>
     <message>
         <source>VT 102</source>
         <translation>VT 102</translation>
     </message>
     <message>
         <source>Linux Console</source>
         <translation>Consola Linux</translation>
     </message>
     <message>
         <source>X-Terminal</source>
         <translation>Terminal X</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>green on black</source>
         <translation>verde em preto</translation>
     </message>
     <message>
         <source>orange on black</source>
         <translation>laranja em preto</translation>
     </message>
 </context>
 </TS>
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
@@ -1,300 +1,328 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BaseSetup</name>
     <message>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slideshow timeout:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Toggle autoscale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to next image</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Delete Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Image Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></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>Browser Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Keyboard Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie Eye - Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Imageinfo Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Imageview Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Go dir up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start slideshow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and Imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show images fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto rotate images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show images unscaled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show zoomer window when unscaled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
     <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>
         <source>&lt;center&gt;&lt;b&gt;Be carefull with the following options!&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show files recursive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recursion depth:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Digital Camera View</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Name Only</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>imageinfo</name>
     <message>
         <source>View Full Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays an thumbnail of the image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays info of selected image</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,144 +1,123 @@
 <!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>
         <source>User</source>
         <translation>Utilizador</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Palavra Chave</translation>
     </message>
     <message>
         <source>Suspend</source>
         <translation>Suspender</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Menu</translation>
     </message>
 </context>
 <context>
     <name>LoginWindowImpl</name>
     <message>
         <source>Restart</source>
         <translation>Reiniciar</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>Sair</translation>
     </message>
     <message>
-        <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
-        <translation type="obsolete">&lt;center&gt;%1 %2&lt;/center&gt;</translation>
-    </message>
-    <message>
         <source>Wrong password</source>
         <translation>Palavra chave inválida</translation>
     </message>
     <message>
         <source>The given password is incorrect.</source>
         <translation>A palavra chave é incorrecta.</translation>
     </message>
     <message>
-        <source>OPIE was terminated
-by an uncaught signal
-(%1)
-</source>
-        <translation type="obsolete">O OPIE terminou 
-devido a um sinal
-de sistema (%1)</translation>
-    </message>
-    <message>
         <source>Failure</source>
         <translation>Falha</translation>
     </message>
     <message>
-        <source>Could not start OPIE.</source>
-        <translation type="obsolete">Não foi possível iniciar o OPIE.</translation>
-    </message>
-    <message>
         <source>Could not switch to new user identity</source>
         <translation>Não foi possível usar essa conta</translation>
     </message>
     <message>
         <source>Opie was terminated
 by an uncaught signal
 (%1)
 </source>
         <translation></translation>
     </message>
     <message>
         <source>Could not start Opie.</source>
         <translation>Não foi possível usar essa conta.</translation>
     </message>
 </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>
     <message>
         <source>&lt;b&gt;Password:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Confirm:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PasswordDialogImpl</name>
     <message>
         <source>Trying to leave without password set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;No password was set. This could lead to you not beeingable to remotely connect to your machine.Do you want to continue not setting a password?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passwords don&apos;t match</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The two passwords don&apos;t match. Please try again.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password not legal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The entered password is not a valid password.Please try entering a valid password.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -115,1067 +115,923 @@
     <message>
         <source>Replace &amp;all</source>
         <translation>Substituir &amp;tudo</translation>
     </message>
     <message>
         <source>Match &amp;case</source>
         <translation>Procura &amp;exacta</translation>
     </message>
     <message>
         <source>Current &amp;selection only</source>
         <translation>Apenas &amp;Selecção actual</translation>
     </message>
     <message>
         <source>&amp;Entire cell</source>
         <translation>&amp;Célula toda</translation>
     </message>
     <message>
         <source>Find &amp; Replace</source>
         <translation>Procurar &amp; Substituir</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Opie Sheet</source>
         <translation>Folha de Cálculo</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
         <source>Inconsistency error!</source>
         <translation>Erro de inconsistência!</translation>
     </message>
     <message>
         <source>File cannot be saved!</source>
         <translation>Não foi possível gravar o ficheiro!</translation>
     </message>
     <message>
         <source>File cannot be opened!</source>
         <translation>Não foi possível abrir o ficheiro!</translation>
     </message>
     <message>
         <source>Invalid file format!</source>
         <translation>Formato de ficheiro inválido!</translation>
     </message>
     <message>
         <source>Save File</source>
         <translation>Gravar Ficheiro</translation>
     </message>
     <message>
         <source>Do you want to save the current file?</source>
         <translation>Deseja gravar o ficheiro actual?</translation>
     </message>
     <message>
         <source>&amp;File Name:</source>
         <translation>Nome do &amp;Ficheiro:</translation>
     </message>
     <message>
         <source>UnnamedFile</source>
         <translation>SemNome</translation>
     </message>
     <message>
         <source>New File</source>
         <translation>Ficheiro Novo</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Novo</translation>
     </message>
     <message>
         <source>Open File</source>
         <translation>Abrir Ficheiro</translation>
     </message>
     <message>
         <source>&amp;Open</source>
         <translation>&amp;Abrir</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation>&amp;Gravar</translation>
     </message>
     <message>
         <source>Save File As</source>
         <translation>Gravar Como</translation>
     </message>
     <message>
         <source>Save &amp;As</source>
         <translation>Gravar &amp;Como</translation>
     </message>
     <message>
         <source>About Opie Sheet</source>
         <translation>Acerca de</translation>
     </message>
     <message>
         <source>Accept</source>
         <translation>Aceitar</translation>
     </message>
     <message>
         <source>&amp;Accept</source>
         <translation>&amp;Aceitar</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancelar</translation>
     </message>
     <message>
         <source>Cell Selector</source>
         <translation>Selecção de Células</translation>
     </message>
     <message>
         <source>Cell &amp;Selector</source>
         <translation>&amp;Selecção de Células</translation>
     </message>
     <message>
         <source>Cut Cells</source>
         <translation>Cortar Células</translation>
     </message>
     <message>
         <source>Cu&amp;t</source>
         <translation>Cor&amp;tar</translation>
     </message>
     <message>
         <source>Copy Cells</source>
         <translation>Copiar Células</translation>
     </message>
     <message>
         <source>&amp;Copy</source>
         <translation>&amp;Copiar</translation>
     </message>
     <message>
         <source>Paste Cells</source>
         <translation>Colar Células</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>Co&amp;lar</translation>
     </message>
     <message>
         <source>Paste Contents</source>
         <translation>Colar Conteúdo</translation>
     </message>
     <message>
         <source>Paste Cont&amp;ents</source>
         <translation>Colar Cont&amp;eúdo</translation>
     </message>
     <message>
         <source>Clear Cells</source>
         <translation>Limpar Células</translation>
     </message>
     <message>
         <source>C&amp;lear</source>
         <translation>&amp;Limpar</translation>
     </message>
     <message>
         <source>Insert Cells</source>
         <translation>Inserir Células</translation>
     </message>
     <message>
         <source>C&amp;ells</source>
         <translation>C&amp;élulas</translation>
     </message>
     <message>
         <source>Insert Rows</source>
         <translation>Inserir Linhas</translation>
     </message>
     <message>
         <source>&amp;Rows</source>
         <translation>&amp;Linhas</translation>
     </message>
     <message>
         <source>Insert Columns</source>
         <translation>Inserir Colunas</translation>
     </message>
     <message>
         <source>&amp;Columns</source>
         <translation>&amp;Colunas</translation>
     </message>
     <message>
         <source>Add Sheets</source>
         <translation>Adicionar Folha</translation>
     </message>
     <message>
         <source>&amp;Sheets</source>
         <translation>&amp;Folhas</translation>
     </message>
     <message>
         <source>Cells</source>
         <translation>Células</translation>
     </message>
     <message>
         <source>&amp;Cells</source>
         <translation>&amp;Células</translation>
     </message>
     <message>
         <source>Row Height</source>
         <translation>Altura da Linha</translation>
     </message>
     <message>
         <source>H&amp;eight</source>
         <translation>&amp;Altura</translation>
     </message>
     <message>
         <source>Adjust Row</source>
         <translation>Ajustar Linha</translation>
     </message>
     <message>
         <source>&amp;Adjust</source>
         <translation>&amp;Ajustar</translation>
     </message>
     <message>
         <source>Show Row</source>
         <translation>Mostrar Coluna</translation>
     </message>
     <message>
         <source>&amp;Show</source>
         <translation>Mo&amp;strar</translation>
     </message>
     <message>
         <source>Hide Row</source>
         <translation>Esconder Coluna</translation>
     </message>
     <message>
         <source>&amp;Hide</source>
         <translation>&amp;Esconder</translation>
     </message>
     <message>
         <source>Column Width</source>
         <translation>Largura da Coluna</translation>
     </message>
     <message>
         <source>&amp;Width</source>
         <translation>&amp;Largura</translation>
     </message>
     <message>
         <source>Adjust Column</source>
         <translation>Ajustar Coluna</translation>
     </message>
     <message>
         <source>Show Column</source>
         <translation>Mostrar Coluna</translation>
     </message>
     <message>
         <source>Hide Column</source>
         <translation>Esconder Coluna</translation>
     </message>
     <message>
         <source>Rename Sheet</source>
         <translation>Mudar Nome da Folha</translation>
     </message>
     <message>
         <source>&amp;Rename</source>
         <translation>&amp;Mudar Nome</translation>
     </message>
     <message>
         <source>Remove Sheet</source>
         <translation>Remover Folha</translation>
     </message>
     <message>
         <source>R&amp;emove</source>
         <translation>R&amp;emover</translation>
     </message>
     <message>
         <source>Sort Data</source>
         <translation>Ordenar Dados</translation>
     </message>
     <message>
         <source>&amp;Sort</source>
         <translation>&amp;Ordenar</translation>
     </message>
     <message>
         <source>Find &amp;&amp; Replace</source>
         <translation>Procurar &amp;&amp; Substituir</translation>
     </message>
     <message>
         <source>&amp;Find &amp;&amp; Replace</source>
         <translation>&amp;Procurar &amp;&amp; Substituir</translation>
     </message>
     <message>
         <source>Equal To</source>
         <translation>Igual A</translation>
     </message>
     <message>
         <source>&amp;Equal To</source>
         <translation>&amp;Igual A</translation>
     </message>
     <message>
         <source>Addition</source>
         <translation>Adição</translation>
     </message>
     <message>
         <source>&amp;Addition</source>
         <translation>&amp;Adição</translation>
     </message>
     <message>
         <source>Subtraction</source>
         <translation>Subtração</translation>
     </message>
     <message>
         <source>&amp;Subtraction</source>
         <translation>&amp;Subtração</translation>
     </message>
     <message>
         <source>Multiplication</source>
         <translation>Multiplicação</translation>
     </message>
     <message>
         <source>&amp;Multiplication</source>
         <translation>&amp;Multiplicação</translation>
     </message>
     <message>
         <source>Division</source>
         <translation>Divisão</translation>
     </message>
     <message>
         <source>&amp;Division</source>
         <translation>&amp;Divisão</translation>
     </message>
     <message>
         <source>Open ParanthesistempCellData-&gt;row+row1, tempCellData-&gt;col+col1</source>
         <translation>Abrir ParêntisestempCellData-&gt;row+row1, tempCellData-&gt;col+col1</translation>
     </message>
     <message>
         <source>&amp;Open Paranthesis</source>
         <translation>&amp;Abrir Parêntises</translation>
     </message>
     <message>
         <source>Close Paranthesis</source>
         <translation>Fechar Parêntises</translation>
     </message>
     <message>
         <source>&amp;Close Paranthesis</source>
         <translation>&amp;Fechar Parêntises</translation>
     </message>
     <message>
         <source>Comma</source>
         <translation>Vírgula</translation>
     </message>
     <message>
         <source>&amp;Comma</source>
         <translation>&amp;Vírgula</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Ficheiro</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Editar</translation>
     </message>
     <message>
         <source>&amp;Insert</source>
         <translation>&amp;Inserir</translation>
     </message>
     <message>
         <source>&amp;Format</source>
         <translation>&amp;Formatar</translation>
     </message>
     <message>
         <source>&amp;Data</source>
         <translation>&amp;Dados</translation>
     </message>
     <message>
         <source>&amp;Row</source>
         <translation>&amp;Linha</translation>
     </message>
     <message>
         <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>
         <source>&amp;Number of sheets:</source>
         <translation>&amp;Número de folhas:</translation>
     </message>
     <message>
         <source>Sheet</source>
         <translation>Folha</translation>
     </message>
     <message>
         <source>&amp;Height of each row:</source>
         <translation>&amp;Altura de cada linha:</translation>
     </message>
     <message>
         <source>&amp;Width of each column:</source>
         <translation>&amp;Largura de cada coluna:</translation>
     </message>
     <message>
         <source>&amp;Sheet Name:</source>
         <translation>&amp;Nome da Folha:</translation>
     </message>
     <message>
         <source>There is only one sheet!</source>
         <translation>Existe apenas uma folha!</translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation>Tem a certeza?</translation>
     </message>
     <message>
         <source>&amp;Type</source>
         <translation>&amp;Tipo</translation>
     </message>
     <message>
         <source>Shift cells &amp;down</source>
         <translation>Mover células para &amp;cima</translation>
     </message>
     <message>
         <source>Shift cells &amp;right</source>
         <translation>Mover células para a &amp;direita</translation>
     </message>
     <message>
         <source>Entire ro&amp;w</source>
         <translation>&amp;Linha toda</translation>
     </message>
     <message>
         <source>Entire &amp;column</source>
         <translation>&amp;Coluna toda</translation>
     </message>
     <message>
         <source>Opie Sheet
 Spreadsheet Software for Opie
 QWDC Beta Winner (as Sheet/Qt)
 
 Developed by: Serdar Ozler
 Release 1.0.2
 Release Date: October 08, 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>Folha de Cálculo
 Software para o Opie
 Vencedor do Beta QWDC (como Sheet/Qt)
 
 Desenvolvido por: Serdar Ozler
 Versão 1.0.2
 Data: 8 de Outubro de 2002
 
 Este software está licenciado sob a licença GPL. A sua distribuição é livre. Para obter uma versão mais recente ou o código fonte, visite o site web.
 
 http://qtopia.sitebest.com</translation>
     </message>
     <message>
         <source>Import Excel file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import E&amp;xcel file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Simple</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ABS(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CEILING(x,acc)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FACT(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FLOOR(x,acc)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>INT(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MOD(x,y)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ROUND(x,digits)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SIGN(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>EXP(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>LN(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>LOG(x,b)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>LOG10(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>POWER(x,y)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SQRT(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DEGREES(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RADIANS(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PI()</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RAND()</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RANDBETWEEN(a,b)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S&amp;tandard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AND(x1,x2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>NOT(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OR(x1,x2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IF(compare,val1,val2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>INDEX(range,index)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ISBLANK(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ISNUMBER(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>EVEN(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ISEVEN(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ODD(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ISODD(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Logical-&amp;Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SIN(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>COS(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>TAN(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ASIN(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ACOS(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ATAN(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ATAN2(x,y)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SINH(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>COSH(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>TANH(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ACOSH(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ASINH(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ATANH(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Trigonometric</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>LEN(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>LEFT(s,num)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RIGHT(s,num)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MID(s,pos,len)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CONCATENATE(s1,s2..)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>EXACT(s1,s2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FIND(what,where,pos)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>REPLACE(s,pos,len,ns)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>REPT(s,n)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>UPPER(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>LOWER(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Strings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AVERAGE(range)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>COUNT(range)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>COUNTIF(range,eqls)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAX(range)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MIN(range)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SUM(range)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SUMSQ(range)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>VAR(range)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>VARP(range)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>STDEV(range)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>STDEVP(range)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SKEW(range)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>KURT(range)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sta&amp;tistical</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BESSELI(x,n)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BESSELJ(x,n)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BESSELK(x,n)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BESSELY(x,n)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BETAI(x,a,b)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ERF(a,b)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ERFC(a,b)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>GAMMALN(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>GAMMAP(x,a)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>GAMMAQ(x,a)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scienti&amp;fic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BETADIST(z,a,b,Q?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CHI2DIST(x,n,Q?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CHIDIST(x,n,Q?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FDIST(z,deg1,deg2,Q?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>GAMMADIST(x,a,b,Q?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>NORMALDIST(x,m,s,Q?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PHI(x,Q?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>POISSON(x,n,Q?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Distributions</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <translation>&amp;Opção</translation>
     </message>
     <message>
         <source>&amp;Sort by</source>
         <translation>&amp;Ordenar por</translation>
     </message>
     <message>
         <source>&amp;Then by</source>
         <translation>&amp;Depois por</translation>
     </message>
     <message>
         <source>Then &amp;by</source>
         <translation>Depois &amp;por</translation>
     </message>
     <message>
         <source>&amp;Case Sensitive</source>
         <translation>&amp;Procura exacta</translation>
     </message>
     <message>
         <source>&amp;Direction</source>
         <translation>&amp;Direção</translation>
     </message>
     <message>
         <source>&amp;Top to bottom (rows)</source>
         <translation>&amp;Cima para baixo (linhas)</translation>
     </message>
     <message>
         <source>&amp;Left to right (columns)</source>
         <translation>&amp;Esquerda para direita (colunas)</translation>
     </message>
     <message>
         <source>Sort</source>
         <translation>Ordenar</translation>
     </message>
     <message>
         <source>&amp;Ascending</source>
         <translation>&amp;Ascendente</translation>
     </message>
     <message>
         <source>&amp;Descending</source>
         <translation>&amp;Descendente</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
         <source>One cell cannot be sorted!</source>
         <translation>Não é possivel ordenar apenas uma célula!</translation>
     </message>
 </context>
 </TS>
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
@@ -1,753 +1,721 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DCCProgress</name>
     <message>
         <source>Receiving file %1 from %2...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully received %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Peer Aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Timeout</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DCCTransferTab</name>
     <message>
         <source>DCC Transfers in Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are transfers in progress. &lt;br&gt;If you close this tab, they will be canceled.&lt;br&gt;Do you want to close it anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DCC Transfer from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is trying to send you the file %2
 (%3 bytes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Reject</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCChannelTab</name>
     <message>
         <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>
         <source>Whois</source>
         <translation>Whois</translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation>Desligado</translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
         <translation>Ligado, a autenticar..</translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
         <translation>Autenticado.</translation>
     </message>
     <message>
         <source>Socket error : </source>
         <translation>Erro na ligação:</translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation>Ligação terminada</translation>
     </message>
 </context>
 <context>
     <name>IRCHistoryLineEdit</name>
     <message>
         <source>Next Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <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>Nonexistant channel join - desynchronized?</source>
         <translation>Entrou num canal não existente - de-sincronizado?</translation>
     </message>
     <message>
         <source>Person has already joined the channel - desynchronized?</source>
         <translation>Esta pessoa já tinha entrado no canal - de-sincronizado?</translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
         <translation>Já tinha entrado neste canal - de-sincronizado?</translation>
     </message>
     <message>
         <source>Parting person not found - desynchronized?</source>
         <translation>A pessoa que saiu não foi encontrada - de-sincronizado?</translation>
     </message>
     <message>
         <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>
         <source>Mode change has unknown type</source>
         <translation>Mudança de modo de tipo desconhecido</translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
         <translation>Mudança de modo de um utilizador desconhecido - de-sincronizado?</translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
         <translation>Mudança de modo de &quot;flag&quot; desconhecida</translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
         <translation>Mudança de modo com &quot;kannel&quot; desconhecido - de-sincronizado?</translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
         <translation>Modos de utilizador ainda não suportados</translation>
     </message>
     <message>
         <source>You were kicked from </source>
         <translation>Foi expulsado de</translation>
     </message>
     <message>
         <source> by </source>
         <translation>por</translation>
     </message>
     <message>
         <source> was kicked from </source>
         <translation>foi expulsado de</translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
         <translation>Expulsão de um utilizador desconhecido - de-sincronização?</translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
         <translation>Expulsão de um canal desconhecido - de-sincronização?</translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
         <translation>Mensagem do servidor de um canal desconhecido</translation>
     </message>
     <message>
         <source>You joined channel </source>
         <translation>Entrou no canal</translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
         <translation>A alcunha já está a ser usada. Escolha uma alcunha diferente e volte a ligar-se</translation>
     </message>
     <message>
         <source>No such nickname</source>
         <translation>Alcunha desconhecida</translation>
     </message>
     <message>
         <source>Received unhandled numeric command: %1</source>
         <translation>Recebido um comando numérico desconhecido: %1</translation>
     </message>
     <message>
         <source>Received unhandled ctcp command: %1</source>
         <translation>Recebido um comando CTCP desconhecido: %1</translation>
     </message>
     <message>
         <source>Received unhandled literal command: %1</source>
         <translation>Recebido um comando literal desconhecido: %1</translation>
     </message>
     <message>
         <source>%1 joined channel %2</source>
         <translation>%1 entrou no canal %2</translation>
     </message>
     <message>
         <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>
         <source>There are %1 unknown connection(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are %1 channels formed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait a while and try again</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Whois %1 (%2@%3)
 Real name: %4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is using server %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is on channels: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Names for %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time on server %1 is %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel or nick %1 doesn&apos;t exists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is no history information for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t change nick to %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You&apos;re not on channel %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>[%1] Operation not permitted, you don&apos;t have enough channel privileges</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connected to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 has been idle for %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 signed on %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP PING with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP PING with unknown channel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP PING with bad recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP VERSION request from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING reply from %1: %2 seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malformed DCC request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
         <translation>A falar em</translation>
     </message>
     <message>
         <source>Private discussion</source>
         <translation>Conversa privada</translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
         <translation>Escreva aqui o texto a ser enviado ao outro utilizador</translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation>Desligado</translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
         <translation>Nome do perfil:</translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
         <translation>O nome do perfil do servidor a mostrar no resumo</translation>
     </message>
     <message>
         <source>Hostname :</source>
         <translation>Servidor:</translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
         <translation>O servidor a ligar - pode ser um nome ou um endereço IP</translation>
     </message>
     <message>
         <source>Port :</source>
         <translation>Porta:</translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
         <translation>A porta do servidor a ligar. Geralmente a 6667</translation>
     </message>
     <message>
         <source>Nickname :</source>
         <translation>Alcunha:</translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
         <translation>A sua alcunha na rede do IRC</translation>
     </message>
     <message>
         <source>Realname :</source>
         <translation>Nome:</translation>
     </message>
     <message>
         <source>Your real name</source>
         <translation>O seu nome real</translation>
     </message>
     <message>
         <source>Password :</source>
         <translation>Palavra Chave:</translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
         <translation>A password para ligar ao servidor (se necessário)</translation>
     </message>
     <message>
         <source>Channels :</source>
         <translation>Canais:</translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
         <translation>Lista de canais a entrar automaticamente, separados por vírgulas</translation>
     </message>
     <message>
         <source>Edit server information</source>
         <translation>Editar informação do servidor</translation>
     </message>
     <message>
         <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>
         <translation>Servidores</translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
         <translation>Escolha um perfil de servidor</translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
         <translation>Escolha um perfil de servidor desta lista e depois escolha Ok</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Adicionar</translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
         <translation>Apagar o perfil de servidor seleccionado actualmente</translation>
     </message>
     <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>
 <context>
     <name>IRCSession</name>
     <message>
         <source>You are now known as %1</source>
         <translation type="unfinished">A sua alcunha mudou para %1</translation>
     </message>
     <message>
         <source>Nickname change of an unknown person</source>
         <translation type="unfinished">Alteração de alcunha de um utilizador desconhecido</translation>
     </message>
     <message>
         <source>%1 is now known as %2</source>
         <translation type="unfinished">%1 mudou a alcunha para %2</translation>
     </message>
 </context>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Lines displayed :</source>
         <translation>Linhas mostradas:</translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
         <translation>Quantidade de linhas a mostrar nas conversas antes que as linhas antigas sejam apagadas - isto é necessário para reduzir o consumo de memória. Escolha 0 se não necessitar esta funcionalidade</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Geral</translation>
     </message>
     <message>
         <source>Background color :</source>
         <translation>Cor do fundo:</translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
         <translation>Cor de fundo a usar nas conversas</translation>
     </message>
     <message>
         <source>Normal text color :</source>
         <translation>Cor do texto:</translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
         <translation>Cor do texto a usar nas conversas</translation>
     </message>
     <message>
         <source>Error color :</source>
         <translation>Cor dos erros:</translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
         <translation>Cor do texto a usar para erros</translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
         <translation>Texto escrito por si:</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
         <translation>Cor do texto escrito a usar para identificar o texto escrito por si</translation>
     </message>
     <message>
         <source>Text written by others :</source>
         <translation>Texto escrito por outros:</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
         <translation>Cor do texto escrito a usar para identificar o texto escrito por outros</translation>
     </message>
     <message>
         <source>Text written by the server :</source>
         <translation>Texto escrito pelo servidor:</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
         <translation>Cor do texto escrito a usar para identificar o texto escrito pelo servidor</translation>
     </message>
     <message>
         <source>Notifications :</source>
         <translation>Notificações:</translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
         <translation>Cor do texto a usar para notificações</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Cores</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Configurações</translation>
     </message>
     <message>
         <source>Display time in chat log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Keyboard Shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCTab</name>
     <message>
         <source>Missing description</source>
         <translation>Descrição em falta</translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
         <translation>Descrição do conteúdo da pasta</translation>
     </message>
     <message>
         <source>Close this tab</source>
         <translation>Fechar esta pasta</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
         <translation>Cliente IRC</translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
         <translation>Ligações ao servidor, canais, perguntas e outras coisas estarão aqui</translation>
     </message>
     <message>
         <source>IRC</source>
         <translation>IRC</translation>
     </message>
     <message>
         <source>New connection</source>
         <translation>Nova ligação</translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
         <translation>Criar uma nova ligação a um servidor IRC</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Configurações</translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
         <translation>Configurar o comportamento e aparência do OpieIRC</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source> User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie IRC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> gives channel operator status to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> removes channel operator status from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> gives voice to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> removes voice from </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,817 +1,878 @@
 <!DOCTYPE TS><TS>
 <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>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerUI</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposeMail</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please create an SMTP account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a File.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Store message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Store message into drafts?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Attachments will not be stored in &quot;Draft&quot; folder&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Receiver specified</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposeMailUI</name>
     <message>
         <source>Compose Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>send later</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>use:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BCC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <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>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>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete the selected Account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select an account.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccountsUI</name>
     <message>
         <source>Configure Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>News</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IMAPconfigUI</name>
     <message>
         <source>Configure IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefix</source>
         <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>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>
     </message>
     <message>
         <source>Send queued mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show/Hide folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Newsgroups</source>
         <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>
     </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>
 <context>
     <name>NNTPconfigUI</name>
     <message>
         <source>Configure NNTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Newsgroup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get newsgroup list from server</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Newmdirdlgui</name>
     <message>
         <source>Enter directory name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directory name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directory contains other subdirs</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <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>
     </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>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></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>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec imapd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>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>
     </message>
     <message>
         <source>Use Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the SMTP Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port of the SMTP Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SelectMailTypeUI</name>
     <message>
         <source>Select Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Account Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>POP3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SMTP</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SettingsDialogUI</name>
     <message>
         <source>Settings Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View mail as Html</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compose Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mails later ( enqueue in outbox )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></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>
     </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>
     </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>
     </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>
     </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>
     </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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Store mail(s) to&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Folder:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create new folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefix will prepend, no need to enter it!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move mail(s)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,226 +1,153 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HelpWindow</name>
     <message>
         <source>Backward</source>
         <translation>Anterior</translation>
     </message>
     <message>
         <source>Forward</source>
         <translation>Próximo</translation>
     </message>
 </context>
 <context>
     <name>QtRec</name>
     <message>
         <source>OpieRecord </source>
         <translation>Gravador Opie</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
         <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>
         <source>Volume</source>
         <translation>Volume</translation>
     </message>
     <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>
     </message>
     <message>
         <source>Send with Ir</source>
         <translation>Irradiar</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Mudar Nome</translation>
     </message>
     <message>
         <source>Ir Beam out</source>
         <translation>A Irradiar</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>Irradiado.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
-        <source>Rec</source>
-        <translation 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>
         <source>Please select file to play</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,151 +1,131 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <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>
         <source>Options</source>
         <translation>Opções</translation>
     </message>
     <message>
         <source>Enter your search terms here</source>
         <translation>Introduza os termos a procurar aqui</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Aplicações</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Documentos</translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation>Lista de Tarefas</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Calendário</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Contactos</translation>
     </message>
     <message>
         <source>Search for: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case sensitive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OListView</name>
     <message>
         <source>Results</source>
         <translation>Resultados</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>show</source>
         <translation>mostrar</translation>
     </message>
     <message>
         <source>edit</source>
         <translation>editar</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>executar</translation>
     </message>
     <message>
         <source>open in filemanager</source>
         <translation>abrir no gestor de ficheiros</translation>
     </message>
     <message>
         <source>open with </source>
         <translation>abrir com</translation>
     </message>
     <message>
-        <source>show completed tasks</source>
-        <translation 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>
         <source>Search in dates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search content</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,451 +1,439 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CalcDlg</name>
     <message>
         <source>Calculate</source>
         <translation>Calcular</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>Limpar</translation>
     </message>
     <message>
         <source>Molecular Weight</source>
         <translation>Peso Molecular</translation>
     </message>
     <message>
         <source>Chemical Formula</source>
         <translation>Fórmula Química</translation>
     </message>
     <message>
         <source>Molecular Weight (u):</source>
         <translation>Peso Molecular (u):</translation>
     </message>
     <message>
         <source>Elemental Composition (%):</source>
         <translation>Composição Elementar (%):</translation>
     </message>
     <message>
         <source>CalcDlg</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OxydataWidget</name>
     <message>
         <source>Block</source>
         <translation>Bloco</translation>
     </message>
     <message>
         <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>
         <source>%1 pm</source>
         <translation>%1 pm</translation>
     </message>
     <message>
         <source>%1 g/cm^3</source>
         <translation>%1 g/cm^3</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation>Peso</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>
 <context>
     <name>Oxygen</name>
     <message>
         <source>Oxygen</source>
         <translation>Oxigénio</translation>
     </message>
     <message>
         <source>PSE</source>
         <translation>PSE</translation>
     </message>
     <message>
         <source>Data</source>
         <translation>Dados</translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation>Cálculos</translation>
     </message>
     <message>
         <source>Hydrogen</source>
         <translation>Hidrogénio</translation>
     </message>
     <message>
         <source>Helium</source>
         <translation>Hélio</translation>
     </message>
     <message>
         <source>Lithium</source>
         <translation>Lítio</translation>
     </message>
     <message>
         <source>Beryllium</source>
         <translation>Berílio</translation>
     </message>
     <message>
         <source>Boron</source>
         <translation>Boro</translation>
     </message>
     <message>
         <source>Carbon</source>
         <translation>Carbono</translation>
     </message>
     <message>
         <source>Nitrogen</source>
         <translation>Nitrogénio</translation>
     </message>
     <message>
         <source>Fluorine</source>
         <translation>Flúor</translation>
     </message>
     <message>
         <source>Neon</source>
         <translation>Néon</translation>
     </message>
     <message>
         <source>Sodium</source>
         <translation>Sódio</translation>
     </message>
     <message>
         <source>Magnesium</source>
         <translation>Magnésio</translation>
     </message>
     <message>
         <source>Aluminum</source>
         <translation>Alumínio</translation>
     </message>
     <message>
         <source>Silicon</source>
         <translation>Silício</translation>
     </message>
     <message>
         <source>Phosphorus</source>
         <translation>Fósforo</translation>
     </message>
     <message>
         <source>Sulfur</source>
         <translation>Enxofre</translation>
     </message>
     <message>
         <source>Chlorine</source>
         <translation>Cloro</translation>
     </message>
     <message>
         <source>Argon</source>
         <translation>Árgon</translation>
     </message>
     <message>
         <source>Potassium</source>
         <translation>Potássio</translation>
     </message>
     <message>
         <source>Calcium</source>
         <translation>Cálcio</translation>
     </message>
     <message>
         <source>Scandium</source>
         <translation>Escândio</translation>
     </message>
     <message>
         <source>Titanium</source>
         <translation>Titânio</translation>
     </message>
     <message>
         <source>Vanadium</source>
         <translation>Vanádio</translation>
     </message>
     <message>
         <source>Chromium</source>
         <translation>Crómio</translation>
     </message>
     <message>
         <source>Manganese</source>
         <translation>Manganésio</translation>
     </message>
     <message>
         <source>Iron</source>
         <translation>Ferro</translation>
     </message>
     <message>
         <source>Cobalt</source>
         <translation>Cobalto</translation>
     </message>
     <message>
         <source>Nickel</source>
         <translation>Níquel</translation>
     </message>
     <message>
         <source>Copper</source>
         <translation>Cobre</translation>
     </message>
     <message>
         <source>Zinc</source>
         <translation>Zinco</translation>
     </message>
     <message>
         <source>Gallium</source>
         <translation>Gálio</translation>
     </message>
     <message>
         <source>Germanium</source>
         <translation>Germânio</translation>
     </message>
     <message>
         <source>Arsenic</source>
         <translation>Arsénico</translation>
     </message>
     <message>
         <source>Selenium</source>
         <translation>Selénio</translation>
     </message>
     <message>
         <source>Bromine</source>
         <translation>Bromo</translation>
     </message>
     <message>
         <source>Krypton</source>
         <translation>Krípton</translation>
     </message>
     <message>
         <source>Rubidium</source>
         <translation>Rubídio</translation>
     </message>
     <message>
         <source>Strontium</source>
         <translation>Estrôncio</translation>
     </message>
     <message>
         <source>Yttrium</source>
         <translation>Ítrio</translation>
     </message>
     <message>
         <source>Zirconium</source>
         <translation>Zircónio</translation>
     </message>
     <message>
         <source>Niobium</source>
         <translation>Nióbio</translation>
     </message>
     <message>
         <source>Molybdenum</source>
         <translation>Molibdénio</translation>
     </message>
     <message>
         <source>Technetium</source>
         <translation>Tecnécio</translation>
     </message>
     <message>
         <source>Ruthenium</source>
         <translation>Ruténio</translation>
     </message>
     <message>
         <source>Rhodium</source>
         <translation>Ródio</translation>
     </message>
     <message>
         <source>Palladium</source>
         <translation>Paládio</translation>
     </message>
     <message>
         <source>Silver</source>
         <translation>Prata</translation>
     </message>
     <message>
         <source>Cadmium</source>
         <translation>Cádmio</translation>
     </message>
     <message>
         <source>Indium</source>
         <translation>Índio</translation>
     </message>
     <message>
         <source>Tin</source>
         <translation>Estanho</translation>
     </message>
     <message>
         <source>Antimony</source>
         <translation>Antimónio</translation>
     </message>
     <message>
         <source>Tellurium</source>
         <translation>Telúrio</translation>
     </message>
     <message>
         <source>Iodine</source>
         <translation>Iodo</translation>
     </message>
     <message>
         <source>Xenon</source>
         <translation>Xénon</translation>
     </message>
     <message>
         <source>Cesium</source>
         <translation>Césio</translation>
     </message>
     <message>
         <source>Barium</source>
         <translation>Bário</translation>
     </message>
     <message>
         <source>Lanthanum</source>
         <translation>Lantânio</translation>
     </message>
     <message>
         <source>Cerium</source>
         <translation>Cério</translation>
     </message>
     <message>
         <source>Praseodymium</source>
         <translation>Praseodímio</translation>
     </message>
     <message>
         <source>Neodymium</source>
         <translation>Neodímio</translation>
     </message>
     <message>
         <source>Promethium</source>
         <translation>Promécio</translation>
     </message>
     <message>
         <source>Samarium</source>
         <translation>Samário</translation>
     </message>
     <message>
         <source>Europium</source>
         <translation>Európio</translation>
     </message>
     <message>
         <source>Gadolinium</source>
         <translation>Gadolíneo</translation>
     </message>
     <message>
         <source>Terbium</source>
         <translation>Térbio</translation>
     </message>
     <message>
         <source>Dysprosium</source>
         <translation>Disprósio</translation>
     </message>
     <message>
         <source>Holmium</source>
         <translation>Holmio</translation>
     </message>
     <message>
         <source>Erbium</source>
         <translation>Érbio</translation>
     </message>
     <message>
         <source>Thulium</source>
         <translation>Túlio</translation>
     </message>
     <message>
         <source>Ytterbium</source>
         <translation>Itérbio</translation>
     </message>
     <message>
         <source>Lutetium</source>
         <translation>Lutécio</translation>
     </message>
     <message>
         <source>Hafnium</source>
         <translation>Háfnio</translation>
     </message>
     <message>
         <source>Tantalum</source>
         <translation>Tântalo</translation>
     </message>
     <message>
         <source>Tungsten</source>
         <translation>Tungsténio</translation>
     </message>
     <message>
         <source>Rhenium</source>
         <translation>Rénio</translation>
     </message>
     <message>
         <source>Osmium</source>
         <translation>Ósmio</translation>
     </message>
     <message>
         <source>Iridium</source>
         <translation>Irídiu</translation>
     </message>
     <message>
         <source>Platinum</source>
         <translation>Platina</translation>
     </message>
     <message>
         <source>Gold</source>
         <translation>Ouro</translation>
     </message>
     <message>
         <source>Mercury</source>
         <translation>Mercúrio</translation>
     </message>
     <message>
         <source>Thallium</source>
         <translation>Tálio</translation>
     </message>
     <message>
         <source>Lead</source>
         <translation>Chumbo</translation>
     </message>
     <message>
         <source>Bismuth</source>
         <translation>Bismuto</translation>
     </message>
     <message>
         <source>Polonium</source>
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
@@ -1,97 +1,73 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CanvasCardWindow</name>
     <message>
         <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>
         <source>&amp;Change card backs</source>
         <translation>&amp;Mudar o desenho das cartas</translation>
     </message>
     <message>
         <source>&amp;Snap to position</source>
         <translation>&amp;Ajustar à posição</translation>
     </message>
     <message>
         <source>Change card backs</source>
         <translation>Mudar o desenho das cartas</translation>
     </message>
     <message>
         <source>Snap to position</source>
         <translation>Ajustar à posição</translation>
     </message>
     <message>
         <source>Turn one card</source>
         <translation>Virar uma carta</translation>
     </message>
     <message>
         <source>Turn three cards</source>
         <translation>Virar três cartas</translation>
     </message>
 </context>
 </TS>
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
@@ -1,446 +1,416 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation>Idioma</translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation>Hora e Data</translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation>Informação Pessoal</translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation>Problema na Aplicação</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation>&lt;p&gt;A aplicação %1 não está a responder.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Quer forçar o término da aplicação?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;p&gt;Foi desactivado o carregamento rápido da aplicação. Toque e espere no icon da aplicação para reactivar.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;b&gt;A aplicação %1 terminou com o código %2.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation>A aplicação terminou</translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation>Não foi encontrada a aplicação</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Não foi possível localizar a aplicação &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Não foi possível encontrar a aplicação %1&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Ok</translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation>Estado da Bateria</translation>
     </message>
     <message>
         <source>Low Battery</source>
         <translation>Bateria Fraca</translation>
     </message>
 </context>
 <context>
     <name>FirstUse</name>
     <message>
         <source>&lt;&lt; Back</source>
         <translation>&lt;&lt; Voltar</translation>
     </message>
     <message>
         <source>Next &gt;&gt;</source>
         <translation>Próxima &gt;&gt;</translation>
     </message>
     <message>
         <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>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation>Execução</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Documentos</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation>- Execução</translation>
     </message>
     <message>
         <source>No application</source>
         <translation>Nenhuma aplicação</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation>&lt;p&gt;Não há nenhuma aplicação definida para este tipo de documento.&lt;p&gt;O tipo do documento é %1.</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>View as text</source>
         <translation>Ver como texto</translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation>&lt;b&gt;A procurar documentos...&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation>Vista em Icones</translation>
     </message>
     <message>
         <source>List View</source>
         <translation>Vista em Lista</translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>All types</source>
         <translation>Todos os tipos</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Vista de Documentos</translation>
     </message>
 </context>
 <context>
     <name>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>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>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scan whole media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation type="unfinished"></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>Modo Salvaguarda</translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation>Gestor de &quot;Plugins&quot;...</translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation>Reiniciar Opie</translation>
     </message>
     <message>
         <source>Help...</source>
         <translation>Ajuda...</translation>
     </message>
 </context>
 <context>
     <name>Server</name>
     <message>
         <source>USB Lock</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation>Informação</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation>&lt;p&gt;A data do sistema não parece ser válida.
 (%1)&lt;/p&gt;&lt;p&gt;Deseja acertar o relógio?&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>Battery level is critical!
-Keep power off until power restored!</source>
-        <translation 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>
         <source>OK</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation>Gestor de &quot;Plugins&quot;...</translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation>Estado da Memória</translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation>Memória Baixa
 Grave os seus dados.</translation>
     </message>
     <message>
         <source>Critical Memory Shortage
 Please end this application
 immediately.</source>
         <translation>Memória Criticamente em Baixo
 Termine esta aplicação imediatamente.</translation>
     </message>
     <message>
         <source>WARNING</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The battery is running very low. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The Back-up battery is very low&lt;p&gt;Please charge the back-up battery</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Shutdown...</source>
         <translation>A desligar...</translation>
     </message>
     <message>
         <source>Terminate</source>
         <translation>Terminar</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation>Terminar o Opie</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation>Reiniciar Dispositivo</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation>Reiniciar Opie</translation>
     </message>
     <message>
-        <source>&lt;p&gt;
-These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
-        <translation 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>
         <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>Abort</source>
         <translation>Abortar</translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation>A Sincronizar:</translation>
     </message>
 </context>
 </TS>
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
@@ -1,408 +1,244 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoginBase</name>
     <message>
         <source>LoginBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login</source>
         <translation type="unfinished">Entrar</translation>
     </message>
     <message>
         <source>Login Automatically</source>
         <translation type="unfinished">Entrar Automaticamente</translation>
     </message>
     <message>
         <source>If you select this option, opie-login will automagically log you in with the user you have selected in the drop-down list.  
 
 For the Zaurus 5x00 this is always the user &quot;root&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This drop-down list allows you to select the user for auto-login
 (if enabled above).  
 
 You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MultiauthConfig</name>
     <message>
         <source>Security configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the order they will appear in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login</source>
         <translation type="unfinished">Entrar</translation>
     </message>
     <message>
         <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>
         <source>Locking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></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-securityplugin-*&lt;/em&gt; package! Once you have done that, you will be able to configure your PDA protection here.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MultiauthGeneralConfig</name>
     <message>
         <source>When to lock Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on Opie start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on Opie resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Multiple plugins authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Required successes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Don&apos;t protect this config screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show explanatory screens</source>
         <translation type="unfinished"></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>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You must save your current settings before trying to authenticate. Press OK to accept and launch a simulated authentication process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you don&apos;t like the result of this test, don&apos;t forget to change your settings before you exit the configuration application!</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>
     </message>
     <message>
         <source>Select a net-range or enter a new one.  
 
 This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
 
 For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
 
 The entry &quot;All&quot; will allow *any* IP to connect. 
 The entry &quot;None&quot; will *deny* any connection.  
 
 If unsure, select &quot;Any&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the selected net range from the list
 
 If you press this button, the currently selected net range will be deleted from the list of net ranges.
 
 If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
 the list to the state it has been when you initially booted your Zaurus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button will restore the list of net ranges
 to the defaults.
 
 Beware that all manually entered net ranges will be lost!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select your sync software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Qtopia 1.7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie 1.0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IntelliSync</source>
         <translation type="unfinished"></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="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,51 +1,43 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>SnakeGame</name>
     <message>
         <source>Snake</source>
         <translation>Cobra</translation>
     </message>
     <message>
         <source>New Game</source>
         <translation>Novo Jogo</translation>
     </message>
     <message>
         <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
@@ -1,389 +1,357 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tests</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error</source>
         <translation type="unfinished"></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>Este gráfico representa o espaço ocupado neste cartão de memória Compact Flash.</translation>
     </message>
     <message>
         <source>Ha</source>
         <translation>Disco</translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation>Este gráfico representa o espaço ocupado neste disco.</translation>
     </message>
     <message>
         <source>SD</source>
         <translation>SD</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation>Este gráfico representa o espaço ocupado neste cartão de memória Secure Digital.</translation>
     </message>
     <message>
         <source>SC</source>
         <translation>SC</translation>
     </message>
     <message>
         <source>In</source>
         <translation>Memória</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>Este gráfico representa o espaço ocupado na memória interna (p.ex. Flash Memory) neste dispositivo.</translation>
     </message>
     <message>
         <source>RA</source>
         <translation>RAM</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation>Este gráfico representa o espaço ocupado na memória RAM.</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>CPU - Aplicações (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>CPU - Systema (%)</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Tipo:</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Este gráfico representa a ocupação do processador.</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Usado (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Buffers (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Cache (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Livre (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Total: %1 kB</translation>
     </message>
     <message>
-        <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
-Memory is categorized as follows:
-
-1. Used - memory used to by Opie and any running applications.
-2. Buffers - temporary storage used to improve performance
-3. Cached - information that has recently been used, but has not been freed yet.
-4. Free - memory not currently used by Opie or any running applications.</source>
-        <translation type="obsolete">Esta página mostra quanta memória (i.e. RAM) está alocada no seu dispositivo.
-A memória está categorizada da seguinte forma:
-
-1. Usada - memória usada pelo Opie e pelas aplicações a correr.
-2. Buffers - memória temporária usada para melhorar a performance.
-3. Cached - memória temporária para manter a ultima informação usada 
-4. Free - memória não usada.</translation>
-    </message>
-    <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Módulo</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamanho</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Usa#</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>Esta é a lista de todos os módulos do kernel actualmente em utilização neste dispositivo.
 
 Clique e espere num módulo para ver informação adicional, ou para o remover da memória.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Seleccione um comando aqui e depois clique no botão &quot;Enviar&quot; para enviar o comando ao módulo seleccionado acima.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Enviar</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Clique aqui para enviar o comando seleccionado ao módulo escolhido em cima.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Esta àrea mostra a informação detalhada deste módulo.</translation>
     </message>
     <message>
         <source>Used by</source>
         <translation>Usado por</translation>
     </message>
     <message>
-        <source>You really want to execute %1 for this module?</source>
-        <translation 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>
         <source>Used (%1 kB)</source>
         <translation>Usado (%1 kB)</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>Disponível (%1 kB)</translation>
     </message>
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Comando</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Estado</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Tempo</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation>Esta é a lista de todos os processos deste dispositivo.
 
 Clique e espere num processo para ver informação adicional, ou para lhe enviar um sinal.</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation>Seleccione um sinal aqui e depois clique no botão &quot;Enviar&quot; para enviar o sinal ao processo seleccionado acima.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Enviar</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation>Clique aqui para enviar o sinal seleccionado ao processo escolhido em cima.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>Esta àrea mostra a informação detalhada deste processo.</translation>
     </message>
     <message>
-        <source>You really want to send %1 to this process?</source>
-        <translation type="obsolete">Deseja mesmo enviar %1 para este processo?</translation>
-    </message>
-    <message>
         <source>Really want to send %1
 to this process?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>Info. Sistema</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Memória</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Armazenamento</translation>
     </message>
     <message>
         <source>CPU</source>
         <translation>CPU</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Processos</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Versão</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>Módulos</translation>
     </message>
     <message>
         <source>Benchmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syslog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Kernel de Linux&lt;/b&gt;&lt;p&gt;Versão:</translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Compilado por:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Versão:</translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Compilado em:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>&lt;p&gt;Versão:</translation>
     </message>
     <message>
-        <source>&lt;p&gt;Model: </source>
-        <translation 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>
         <source>Built against Qt/E </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,69 +1,58 @@
 <!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>
     <message>
         <source>TableViewer - Edit Keys</source>
         <translation>Editar Chaves</translation>
     </message>
     <message>
         <source>Key Name</source>
         <translation>Nome da Chave</translation>
     </message>
     <message>
         <source>Key Type</source>
         <translation>Tipo de Chave</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Clear All</source>
         <translation>Limpar Tudo</translation>
     </message>
 </context>
 <context>
     <name>TVListView</name>
     <message>
         <source>List View</source>
         <translation>Vista em Lista</translation>
     </message>
 </context>
 <context>
     <name>TableViewerWindow</name>
     <message>
         <source>Table Viewer</source>
         <translation>Bases de Dados</translation>
     </message>
     <message>
         <source>could not load Document</source>
         <translation>não foi possível aceder ao ficheiro</translation>
     </message>
 </context>
 </TS>
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,48 +1,41 @@
 <!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>
     </message>
     <message>
         <source>Quit</source>
         <translation>Sair</translation>
     </message>
     <message>
         <source>Click Play to start</source>
         <translation>Click Jogar para começar</translation>
     </message>
     <message>
         <source>Make your move</source>
         <translation>Sua vez de jogar</translation>
     </message>
     <message>
         <source>You won!</source>
         <translation>Ganhou!</translation>
     </message>
     <message>
         <source>Computer won!</source>
         <translation>Perdeu!</translation>
     </message>
     <message>
         <source>It&apos;s a draw</source>
         <translation>Empate</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/today.ts b/i18n/pt/today.ts
index 09fdd71..a78b877 100644
--- a/i18n/pt/today.ts
+++ b/i18n/pt/today.ts
@@ -1,198 +1,142 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <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>
         <translation>Hoje</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
         <translation>Hoje, por Maximilian Reiß</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>Clique aqui para a janela de configuração</translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>Quais os extras a carregar e qual a ordem:</translation>
     </message>
     <message>
         <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>
         <source>autostart on resume?</source>
         <translation>iniciar ao ligar?</translation>
     </message>
     <message>
         <source>tiny banner</source>
         <translation>barra pequena</translation>
     </message>
     <message>
         <source>Have small banner </source>
         <translation>Com barra pequena</translation>
     </message>
     <message>
         <source> min</source>
         <translation>min</translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
         <translation>Qual o intervalo de inactividade, em minutos, para que o&quot;hoje&quot; seja iniciado ao ligar</translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation>minutos inactivo</translation>
     </message>
     <message>
         <source> pixel</source>
         <translation>píxel</translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
         <translation>Altere o tamanho do icone, em pixeis</translation>
     </message>
     <message>
         <source>icon size</source>
         <translation>tamanho do icone</translation>
     </message>
     <message>
         <source> sec</source>
         <translation>seg</translation>
     </message>
     <message>
         <source>never</source>
         <translation>nunca</translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
         <translation>Qual o intervalo de actualização</translation>
     </message>
     <message>
         <source>refresh</source>
         <translation>actualizar</translation>
     </message>
 </context>
 </TS>
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
@@ -1,653 +1,565 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>&lt;h1&gt;Alarm at %1&lt;/h1&gt;&lt;br&gt;</source>
         <translation>&lt;h1&gt;Alarme em %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">Vazio</translation>
     </message>
 </context>
 <context>
     <name>NewTaskDlg</name>
     <message>
         <source>New Task</source>
         <translation type="unfinished">Nova Tarefa</translation>
     </message>
     <message>
         <source>Blank task</source>
         <translation type="unfinished"></translation>
     </message>
     <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>Information</source>
         <translation>Informação</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Estado</translation>
     </message>
     <message>
         <source>Recurrence</source>
         <translation>Recorrência</translation>
     </message>
     <message>
         <source>Task Editor</source>
         <translation>Editor de Tarefas</translation>
     </message>
 </context>
 <context>
     <name>Opie</name>
     <message>
         <source>Todo List</source>
         <translation type="unfinished">Lista de Tarefas</translation>
     </message>
     <message>
         <source>Task</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
         <translation>Introduza Tarefa</translation>
     </message>
     <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>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Remover</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation>Novo Exemplo %1</translation>
     </message>
     <message>
         <source>Click here to set the priority of new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Clique aqui para mudar a prioridade da tarefa.
 
 Esta àrea é chamada de barra de tarefas rápidas.
 
 Ela permite-lhe adicionar rápidamente uma tarefa à lista. Esta àrea pode ser visível ou não através do menu &quot;Opções -&gt; Mostrar barra de tarefas rápidas&quot;.</translation>
     </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>Introduza a descrição da nova tarefa aqui.
 
 Esta àrea é chamada de barra de tarefas rápidas.
 
 Ela permite-lhe adicionar rápidamente uma tarefa à lista. Esta àrea pode ser visível ou não através do menu &quot;Opções -&gt; Mostrar barra de tarefas rápidas&quot;.
 </translation>
     </message>
     <message>
         <source>More</source>
         <translation>Mais</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>Clique aqui para adicionar informação à tarefa.
 
 Esta àrea é chamada de barra de tarefas rápidas.
 
 Ela permite-lhe adicionar rápidamente uma tarefa à lista. Esta àrea pode ser visível ou não através do menu &quot;Opções -&gt; Mostrar barra de tarefas rápidas&quot;.</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Introduza</translation>
     </message>
     <message>
         <source>Click here to add new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Clique aqui adicionar uma tarefa.
 
 Esta àrea é chamada de barra de tarefas rápidas.
 
 Ela permite-lhe adicionar rápidamente uma tarefa à lista. Esta àrea pode ser visível ou não através do menu &quot;Opções -&gt; Mostrar barra de tarefas rápidas&quot;.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
         <source>Click here to reset new task information.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Clique aqui para limpar a informação da tarefa.
 
 Esta àrea é chamada de barra de tarefas rápidas.
 
 Ela permite-lhe adicionar rápidamente uma tarefa à lista. Esta àrea pode ser visível ou não através do menu &quot;Opções -&gt; Mostrar barra de tarefas rápidas&quot;.</translation>
     </message>
     <message>
         <source>Data can not be edited, currently syncing</source>
         <translation>Não é possível editar os dados enquanto está a sincronizar</translation>
     </message>
     <message>
         <source>Data can&apos;t be edited, currently syncing</source>
         <translation>Não é possível editar os dados enquanto está a sincronizar</translation>
     </message>
     <message>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>Table View</source>
         <translation>Vista de Tabela</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nada</translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation>%1 dia(s)</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Hora</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Description:</source>
         <translation>Descrição:</translation>
     </message>
     <message>
         <source>Enter brief description of the task here.</source>
         <translation>Introduza uma descrição curta da tarefa aqui.</translation>
     </message>
     <message>
         <source>Complete </source>
         <translation>Completa</translation>
     </message>
     <message>
         <source>Work on </source>
         <translation>Trabalhar em</translation>
     </message>
     <message>
         <source>Buy </source>
         <translation>Comprar</translation>
     </message>
     <message>
         <source>Organize </source>
         <translation>Organizar</translation>
     </message>
     <message>
         <source>Get </source>
         <translation>Obter</translation>
     </message>
     <message>
         <source>Update </source>
         <translation>Actualizar</translation>
     </message>
     <message>
         <source>Create </source>
         <translation>Criar</translation>
     </message>
     <message>
         <source>Plan </source>
         <translation>Plano</translation>
     </message>
     <message>
         <source>Call </source>
         <translation>Chamada</translation>
     </message>
     <message>
         <source>Mail </source>
         <translation>EMail</translation>
     </message>
     <message>
         <source>Select priority of task here.</source>
         <translation>Escolha a prioridade da tarefa aqui.</translation>
     </message>
     <message>
         <source>Very High</source>
         <translation>Muito Alta</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Alta</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Baixa</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>Muito Baixa</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoria:</translation>
     </message>
     <message>
         <source>Select category to organize this task with.</source>
         <translation>Escolha a categoria da tarefa aqui.</translation>
     </message>
     <message>
         <source>Recurring task</source>
         <translation>Tarefa recorrente</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>Clique aqui se a tarefa é recursiva. A frequência pode ser configurada na opção de &quot;Recorrência&quot;.</translation>
     </message>
     <message>
         <source>Enter any additional information about this task here.</source>
         <translation>Introduza informação adicional da tarefa aqui.</translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation>Lista de Tarefas</translation>
     </message>
     <message>
         <source>Summary:</source>
         <translation>Sumário:</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorStatus</name>
     <message>
         <source>Status:</source>
         <translation>Estado:</translation>
     </message>
     <message>
         <source>Click here to set the current status of this task.</source>
         <translation>Clique aqui para mudar o estado desta tarefa.</translation>
     </message>
     <message>
         <source>Started</source>
         <translation>Iniciada</translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation>Adiada</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>Terminada</translation>
     </message>
     <message>
         <source>Not started</source>
         <translation>Por Iniciar</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Progresso:</translation>
     </message>
     <message>
         <source>Select progress made on this task here.</source>
         <translation>Escolha o progresso desta tarefa.</translation>
     </message>
     <message>
         <source>0 %</source>
         <translation>0%</translation>
     </message>
     <message>
         <source>20 %</source>
         <translation>20%</translation>
     </message>
     <message>
         <source>40 %</source>
         <translation>40%</translation>
     </message>
     <message>
         <source>60 %</source>
         <translation>60%</translation>
     </message>
     <message>
         <source>80 %</source>
         <translation>80%</translation>
     </message>
     <message>
         <source>100 %</source>
         <translation>100%</translation>
     </message>
     <message>
         <source>Start Date:</source>
         <translation>Data Início:</translation>
     </message>
     <message>
         <source>Click here to set the date this task was started.</source>
         <translation>Clique aqui para alterar a data de início desta tarefa.</translation>
     </message>
     <message>
         <source>Due Date:</source>
         <translation>Data Limite:</translation>
     </message>
     <message>
         <source>Click here to set the date this task needs to be completed by.</source>
         <translation>Clique aqui para alterar a data limite desta tarefa.</translation>
     </message>
     <message>
         <source>Completed:</source>
         <translation>Terminada:</translation>
     </message>
     <message>
         <source>Click here to mark this task as completed.</source>
         <translation>Clique aqui para marcar esta tarefa como completa.</translation>
     </message>
     <message>
         <source>Click here to set the date this task was completed.</source>
         <translation>Clique aqui para introduzir a data em que esta tarefa foi completa.</translation>
     </message>
     <message>
         <source>Maintainer Mode:</source>
         <translation>Modo de Manutenção:</translation>
     </message>
     <message>
         <source>Click here to set the maintainer&apos;s role.</source>
         <translation>Clique aqui para mudar a regra de manutenção.</translation>
     </message>
     <message>
         <source>Nothing</source>
         <translation>Nada</translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation>Responsável</translation>
     </message>
     <message>
         <source>Done By</source>
         <translation>Feito Por</translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation>Coordenação</translation>
     </message>
     <message>
         <source>Maintainer:</source>
         <translation>Mantenedor:</translation>
     </message>
     <message>
         <source>This is the name of the current task maintainer.</source>
         <translation>Este é o nome do mantenedor da tarefa actual.</translation>
     </message>
     <message>
         <source>test</source>
         <translation>test</translation>
     </message>
     <message>
         <source>Click here to select the task maintainer.</source>
         <translation>Clique aqui para mudar o mantenedor da tarefa.</translation>
     </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
@@ -1,35 +1,31 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GroupDialog</name>
     <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>
         <translation>Editar User</translation>
     </message>
 </context>
 </TS>
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,832 +1,566 @@
 <!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>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <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>
         <source>&amp;Import text file</source>
         <translation>Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
         <translation>Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
         <translation>&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation 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>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation 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>
         <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
         <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
         <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
         <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
         <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
         <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
         <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
         <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
         <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
         <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
         <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
         <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
         <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
         <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
         <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
         <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
-        <source>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>
         <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No document defined.
 You have to create a new document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to save </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 before continuing?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Now you have to enter
 a password twice for your
 newly created document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&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>
         <source>&lt;P&gt;You must create a new document first. Ok to create?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Password Manager&lt;br&gt;ZSafe version 2.1.2&lt;br&gt;&lt;/b&gt;by Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Translations by Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,569 +1,489 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AbTable</name>
     <message>
         <source>Pick</source>
         <translation>Escolha</translation>
     </message>
     <message>
         <source>Full Name</source>
         <translation>Nome Comp</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Contato</translation>
     </message>
 </context>
 <context>
     <name>AbView</name>
     <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>
         <source>Unable to find a contact for this search pattern!</source>
         <translation>Nenhum contato encontrado para esta busca!</translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation>O arquivo selecionado
 não termina em &quot;.vcf&quot;.
 Deseja mesmo abrí-lo?</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>Adicionar Contato ?</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>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation>Tipo de Busca</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>usar Expressões Regulares</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>Usar Máscaras (*,?)</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Sensível à Caixa</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Correio</translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation>Usar QT-Mail</translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation>Usar Opie-Mail</translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation>Aviso: QT-Mail somente é
 fornecido na ROM padrão
 da SHARP. Opie-Mail é
 fornecido livremente !</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Misc</translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation>Configurações de Busca</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Fonte</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Pequena</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Grande</translation>
     </message>
     <message>
         <source>Order</source>
         <translation>Ordem</translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation>Selecionar Ordem de Contato:</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Sobe</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Desce</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Adicionar</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Remover</translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation>Configuração</translation>
     </message>
     <message>
         <source>Click on tab to select one</source>
         <translation>Clique em uma guia para selecionar</translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation>Configurações do tipo de busca</translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation>O campo de busca aceitará expressões regulares se marcado</translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
         <translation>O campo de busca aceitará apenas máscaras simples</translation>
     </message>
     <message>
         <source>If selected, search differs between upper and lower chars</source>
         <translation>Se marcado, a busca diferenciará maiúsculas e minúsculas</translation>
     </message>
     <message>
         <source>Font size for list- and card view</source>
         <translation>Tamanho da fonte para visão em lista e cartão</translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
         <translation>Configuração de fonte para visão em lista e cartão</translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation>Use a aplicação de correio da Sharp se disponível</translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</source>
         <translation>Use correio OPIE se instalado</translation>
     </message>
     <message>
         <source>Move selected attribute one line up</source>
         <translation>Mover atributo selecionado uma linha acima</translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation>Mover atributo selecionado uma linha abaixo</translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation>Lista de todos os atributos disponíveis</translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation>Adiciona o atributo selecionado na lista abaixo à lista acima</translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation>Rmove o atributo selecionado da lista acima</translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation>A ordem (Cima -&gt; Baixo) define o primeiro contato mostrado na segunda coluna da visão em lista</translation>
     </message>
     <message>
         <source>Tool-/Menubar</source>
         <translation>Barra de Ferramentas/Menu</translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation>Fixo</translation>
     </message>
     <message>
         <source>Switch to fixed menu-/toolbars after restarting application !</source>
         <translation>Alterna entre para barra de ferramentas/menu fixa após reiniciar a aplicação !</translation>
     </message>
     <message>
         <source>Moveable</source>
         <translation>Móvel</translation>
     </message>
     <message>
         <source>Switch to moveable menu-/toolbars after restarting application !</source>
         <translation>Alterna para barra de ferramentas/menu móveis após reiniciar a aplicação !</translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>First Name</source>
         <translation>Nome</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Nome do Meio</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Sobrenome</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Sufixo</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Arquivar Como</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Sexo</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Título Prof</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Cidade</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Estado</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>País</translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation>Nome Comp...</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Organização</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Categoria</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Notas...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Geral</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Comercial</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Residencial</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Endereço</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>CEP</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>Estados Unidos</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Reino Unido</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>Japão</translation>
     </message>
     <message>
         <source>France</source>
         <translation>França</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>Alemanha</translation>
     </message>
     <message>
         <source>Norway</source>
         <translation>Noruega</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>Canadá</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Masculino</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Feminino</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Detalhes</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>Escrever Nota</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>Editar Nome</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Contatos</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation>Albânia</translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation>Algéria</translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation>Samoa Americana</translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation>Andorra</translation>
     </message>
     <message>
         <source>Angola</source>
         <translation>Angola</translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation>Anguilla</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>Argentina</translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation>Aruba</translation>
     </message>
     <message>
         <source>Australia</source>
         <translation>Austrália</translation>
     </message>
     <message>
         <source>Austria</source>
         <translation>Áustria</translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation>Azerbaijão</translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation>Bahamas</translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation>Bahrain</translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation>Bangladesh</translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation>Barbados</translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation>Belarus</translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation>Bélgica</translation>
     </message>
     <message>
@@ -1013,552 +933,385 @@ fornecido livremente !</translation>
     <message>
         <source>Oman</source>
         <translation>Oman</translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation>Paquistão</translation>
     </message>
     <message>
         <source>Palau</source>
         <translation>Palau</translation>
     </message>
     <message>
         <source>Panama</source>
         <translation>Panamá</translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation>Papua Nova Guiné</translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation>Paraguai</translation>
     </message>
     <message>
         <source>Peru</source>
         <translation>Peru</translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation>Filipinas</translation>
     </message>
     <message>
         <source>Poland</source>
         <translation>Polônia</translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation>Portugal</translation>
     </message>
     <message>
         <source>Puerto Rico</source>
         <translation>Porto Rico</translation>
     </message>
     <message>
         <source>Qatar</source>
         <translation>Qatar</translation>
     </message>
     <message>
         <source>Reunion</source>
         <translation>Reunião</translation>
     </message>
     <message>
         <source>Romania</source>
         <translation>Romênia</translation>
     </message>
     <message>
         <source>Russia</source>
         <translation>Russia</translation>
     </message>
     <message>
         <source>Rwanda</source>
         <translation>Ruanda</translation>
     </message>
     <message>
         <source>Saint Lucia</source>
         <translation>Santa Lúcia</translation>
     </message>
     <message>
         <source>Samoa</source>
         <translation>Samoa</translation>
     </message>
     <message>
         <source>San Marino</source>
         <translation>San Marino</translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
         <translation>Árabia Saudita</translation>
     </message>
     <message>
         <source>Senegal</source>
         <translation>Senegal</translation>
     </message>
     <message>
         <source>Seychelles</source>
         <translation>Seychelles</translation>
     </message>
     <message>
         <source>Sierra Leone</source>
         <translation>Serra Leoa</translation>
     </message>
     <message>
         <source>Singapore</source>
         <translation>Singapura</translation>
     </message>
     <message>
         <source>Slovakia</source>
         <translation>Slovaquia</translation>
     </message>
     <message>
         <source>Slovenia</source>
         <translation>Slovenia</translation>
     </message>
     <message>
         <source>Solomon Islands</source>
         <translation>Ilhas Salomão</translation>
     </message>
     <message>
         <source>Somalia</source>
         <translation>Somália</translation>
     </message>
     <message>
         <source>South Africa</source>
         <translation>África do Sul</translation>
     </message>
     <message>
         <source>Spain</source>
         <translation>Espanha</translation>
     </message>
     <message>
         <source>Sri Lanka</source>
         <translation>Sri Lanka</translation>
     </message>
     <message>
         <source>St. Helena</source>
         <translation>St. Helena</translation>
     </message>
     <message>
         <source>Sudan</source>
         <translation>Sudão</translation>
     </message>
     <message>
         <source>Suriname</source>
         <translation>Suriname</translation>
     </message>
     <message>
         <source>Swaziland</source>
         <translation>Suazilândia</translation>
     </message>
     <message>
         <source>Sweden</source>
         <translation>Suécia</translation>
     </message>
     <message>
         <source>Switzerland</source>
         <translation>Suiça</translation>
     </message>
     <message>
         <source>Taiwan</source>
         <translation>Taiwan</translation>
     </message>
     <message>
         <source>Tajikistan</source>
         <translation>Tadjiquistão</translation>
     </message>
     <message>
         <source>Tanzania</source>
         <translation>Tanzânia</translation>
     </message>
     <message>
         <source>Thailand</source>
         <translation>Tailândia</translation>
     </message>
     <message>
         <source>Togo</source>
         <translation>Togo</translation>
     </message>
     <message>
         <source>Tokelau</source>
         <translation>Tokelau</translation>
     </message>
     <message>
         <source>Tonga</source>
         <translation>Tonga</translation>
     </message>
     <message>
         <source>Tunisia</source>
         <translation>Tunísia</translation>
     </message>
     <message>
         <source>Turkey</source>
         <translation>Turquia</translation>
     </message>
     <message>
         <source>Turkmenistan</source>
         <translation>Turcomenistão</translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation>Tuvalu</translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation>Uganda</translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation>Ucrânia</translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation>Uruguai</translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation>Uzbequistão</translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation>Vanuatu</translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation>Venezuela</translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation>Ilhas Virgens</translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation>Saara Ocidental</translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation>Iêmen</translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation>Iugoslávia</translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation>Zâmbia</translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation>Zimbábue</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Aniverário</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Casamento</translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation>Kuwait</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Desconhecido</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Afghanistan</source>
         <translation>Afeganistão</translation>
     </message>
     <message>
         <source>Antarctica</source>
         <translation>Antárctica</translation>
     </message>
     <message>
         <source>Armenia</source>
         <translation>Armênia</translation>
     </message>
     <message>
         <source>Bolivia</source>
         <translation>Bolívia</translation>
     </message>
     <message>
         <source>Cameroon</source>
         <translation>Camarões</translation>
     </message>
     <message>
         <source>Ghana</source>
         <translation>Gana</translation>
     </message>
     <message>
         <source>Guadeloupe</source>
         <translation>Guadalupe</translation>
     </message>
     <message>
         <source>Guinea-Bissau</source>
         <translation>Guiné-Bissau</translation>
     </message>
     <message>
         <source>Jamaica</source>
         <translation>Jamaica</translation>
     </message>
     <message>
         <source>Kiribati</source>
         <translation>Kiribati</translation>
     </message>
     <message>
         <source>Kyrgyzstan</source>
         <translation>Quirguizstão</translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
         <translation>Áreas Palestinas Soberanas</translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
         <translation>Ilhas Pitcairn</translation>
     </message>
     <message>
         <source>Vietnam</source>
         <translation>Vietnã</translation>
     </message>
     <message>
         <source>Press to enter last- middle and firstname</source>
         <translation>Pressione para entrar com sobrenome, nome do meio e nome</translation>
     </message>
     <message>
         <source>Enter fullname directly ! If you have a lastname with multiple words ( for instance &quot;de la Guerra&quot;), please write &lt;lastname&gt;,&lt;firstnames&gt; like this: &quot;de la Guerra, Carlos Pedro&quot;</source>
         <translation>Entre o nome completo diretamente ! Se você tem um sobrenome com várias palavras (por exemplo &quot;Da Silva&quot;), escreva &lt;sobrenome&gt;,&lt;nomes&gt; desta forma: &quot;Da Silva, José Maria&quot;</translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation>O Título Profissional</translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation>Algo como &quot;jr.&quot;..</translation>
     </message>
     <message>
         <source>The working place of the contact</source>
         <translation>O local de trabalho do contato</translation>
     </message>
     <message>
         <source>Press to select attribute to change</source>
         <translation>Pressione para selecionar o atributo a alterar</translation>
     </message>
     <message>
         <source>Press to select how to store the name (and howto show it in the listview)</source>
         <translation>Pressione para selecionar como o nome será armazenado (e como será mostrado na visão em lista)</translation>
     </message>
     <message>
         <source></source>
         <translation></translation>
     </message>
 </context>
 <context>
     <name>Opie</name>
     <message>
         <source>Contact</source>
         <translation type="unfinished">Contato</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation type="unfinished">Contatos</translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation type="unfinished">Iniciar Busca</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation type="unfinished">Escrever E-mail Para</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation type="unfinished">Importar vCard</translation>
     </message>
     <message>
         <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
@@ -1,453 +1,359 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>AdvancedFm</source>
         <translation>AdvancedFm</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Arquivo</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation>Mostrar Arquivos Ocultos</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>Criar Diretório</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Renomear</translation>
     </message>
     <message>
         <source>Run Command</source>
         <translation>Executar Comando</translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation>Executar Comando com Saída</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Remover</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamanho</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sim</translation>
     </message>
     <message>
         <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>
         <source>Ir sent.</source>
         <translation>Enviado por Iv.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>Mudar Diretório</translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>Executar</translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation>Abrir como texto</translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation>Criar LInk Simbólico</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copia</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>Mover</translation>
     </message>
     <message>
         <source>File Info</source>
         <translation>Inform. do Arquivo</translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation>Ajustar Permissões</translation>
     </message>
     <message>
         <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>
         <source> kB free</source>
         <translation> kB livres</translation>
     </message>
     <message>
         <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>
         <source>Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1 files?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1 and all it&apos;s contents?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really copy %1 files?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 already  exists. Ok to overwrite?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Could not copy %1 to %2&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy %1 As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt; %1 already exists. Ok to overwrite?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not copy %1 to %2&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt; %1 already exists. Do you really want to delete it?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not move %1&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not copy %1 to %2&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Salvar saída para arquivo (ome apenas)</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Saída</translation>
     </message>
     <message>
         <source>Process could not start</source>
         <translation>Processo não pôde iniciar</translation>
     </message>
     <message>
         <source>Error
 </source>
         <translation>Erro
 </translation>
     </message>
     <message>
         <source>
 Finished
 </source>
         <translation>Terminado</translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Ajustar Permissões de Arquivo</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Ajustar permissões de arquivo para:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>dono</translation>
     </message>
     <message>
         <source>group</source>
         <translation>grupo</translation>
     </message>
     <message>
         <source>others</source>
         <translation>outros</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Dono</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Grupo</translation>
     </message>
     <message>
         <source>read</source>
         <translation>ler</translation>
     </message>
     <message>
         <source>write</source>
         <translation>gravar</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>executar</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Aviso</translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation>Erro- sem usuário</translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation>Erro- sem grupo</translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation>Erro ajustando propriedade ou grupo</translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation>Erro ajustando modo</translation>
     </message>
     <message>
         <source>filePermissions</source>
         <translation>Permissões de arquivo</translation>
     </message>
 </context>
 </TS>
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
@@ -1,340 +1,332 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Calculator</name>
     <message>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
         <source>(</source>
         <translation>(</translation>
     </message>
     <message>
         <source>)</source>
         <translation>)</translation>
     </message>
     <message>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
         <source>.</source>
         <translation>.</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>=</source>
         <translation>=</translation>
     </message>
     <message>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
         <source>CE</source>
         <translation>CE</translation>
     </message>
     <message>
         <source>M+</source>
         <translation>M+</translation>
     </message>
     <message>
         <source>MC</source>
         <translation>MC</translation>
     </message>
     <message>
         <source>MR</source>
         <translation>MR</translation>
     </message>
     <message>
         <source>ln</source>
         <translation>ln</translation>
     </message>
     <message>
         <source>+/-</source>
         <translation>+/-</translation>
     </message>
     <message>
         <source>cos</source>
         <translation>cos</translation>
     </message>
     <message>
         <source>log</source>
         <translation>log</translation>
     </message>
     <message>
         <source>sin</source>
         <translation>sen</translation>
     </message>
     <message>
         <source>tan</source>
         <translation>tan</translation>
     </message>
     <message>
-        <source>Experimental Calculator</source>
-        <translation 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>
         <translation>Peso</translation>
     </message>
     <message>
         <source>Distance</source>
         <translation>Distância</translation>
     </message>
     <message>
         <source>Area</source>
         <translation>Área</translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation>Temperatura</translation>
     </message>
     <message>
         <source>Volume</source>
         <translation>Volume</translation>
     </message>
     <message>
         <source>acres</source>
         <translation>acres</translation>
     </message>
     <message>
         <source>&#xb0;C</source>
         <translation>°C</translation>
     </message>
     <message>
         <source>carats</source>
         <translation>quilates</translation>
     </message>
     <message>
         <source>cm</source>
         <translation>cm</translation>
     </message>
     <message>
         <source>cu cm</source>
         <translation>cm³</translation>
     </message>
     <message>
         <source>cu ft</source>
         <translation>cu ft</translation>
     </message>
     <message>
         <source>cu in</source>
         <translation>cu in</translation>
     </message>
     <message>
         <source>&#xb0;F</source>
         <translation>°F</translation>
     </message>
     <message>
         <source>fl oz (US)</source>
         <translation>fl oz (US)</translation>
     </message>
     <message>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
         <source>g</source>
         <translation>g</translation>
     </message>
     <message>
         <source>gal (US)</source>
         <translation>gal (US)</translation>
     </message>
     <message>
         <source>hectares</source>
         <translation>hectares</translation>
     </message>
     <message>
         <source>in</source>
         <translation>pol</translation>
     </message>
     <message>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
         <source>km</source>
         <translation>km</translation>
     </message>
     <message>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
         <source>lb</source>
         <translation>lb</translation>
     </message>
     <message>
         <source>Lg tons</source>
         <translation>Lg tons</translation>
     </message>
     <message>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
         <source>mg</source>
         <translation>mg</translation>
     </message>
     <message>
         <source>mi</source>
         <translation>mi</translation>
     </message>
     <message>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
         <source>mm</source>
         <translation>mm</translation>
     </message>
     <message>
         <source>naut. mi</source>
         <translation>naut. mi</translation>
     </message>
     <message>
         <source>oz</source>
         <translation>oz</translation>
     </message>
     <message>
         <source>points</source>
         <translation>pontos</translation>
     </message>
     <message>
         <source>pt</source>
         <translation>pt</translation>
     </message>
     <message>
         <source>qt</source>
         <translation>qt</translation>
     </message>
     <message>
         <source>sq cm</source>
         <translation>cm²</translation>
     </message>
     <message>
         <source>sq ft</source>
         <translation>sq ft</translation>
     </message>
     <message>
         <source>sq in</source>
         <translation>sq in</translation>
     </message>
     <message>
         <source>sq km</source>
         <translation>km²</translation>
     </message>
     <message>
         <source>sq m</source>
         <translation>m²</translation>
     </message>
     <message>
         <source>sq mi</source>
         <translation>sq mi</translation>
     </message>
     <message>
         <source>sq mm</source>
         <translation>mm²</translation>
     </message>
     <message>
         <source>sq yd</source>
         <translation>sq yd</translation>
     </message>
     <message>
         <source>st</source>
         <translation>st</translation>
     </message>
     <message>
         <source>St tons</source>
         <translation>St tons</translation>
     </message>
     <message>
         <source>tblspoon</source>
         <translation>tblspoon</translation>
     </message>
     <message>
         <source>teaspoons</source>
         <translation>teaspoons</translation>
     </message>
     <message>
         <source>tonnes</source>
         <translation>toneladas</translation>
     </message>
     <message>
         <source>yd</source>
         <translation>yd</translation>
     </message>
 </context>
 </TS>
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
@@ -1,287 +1,207 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AlarmDlg</name>
     <message>
         <source>Clock</source>
         <translation type="unfinished">Relógio</translation>
     </message>
     <message>
         <source>Snooze</source>
         <translation type="unfinished">Dormir</translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AlarmDlgBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>TextLabel1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Snooze</source>
         <translation type="unfinished">Dormir</translation>
     </message>
     <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>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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thu</source>
         <comment>Thursday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fri</source>
         <comment>Friday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat</source>
         <comment>Saturday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sun</source>
         <comment>Sunday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lap/Split</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Daily Alarm:&lt;/b&gt;&lt;p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily alarm requires at least
 one day to be selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished">Tudo</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished">Audio</translation>
     </message>
 </context>
 <context>
     <name>ClockBase</name>
     <message>
         <source>Clock</source>
         <translation type="unfinished">Relógio</translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stopwatch</source>
         <translation type="unfinished">Cronômetro</translation>
     </message>
     <message>
         <source>Split</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished">Iniciar</translation>
     </message>
     <message>
         <source>Starts and stops the stopwatch.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lap/Split</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Resets the stopwatch.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check to enable the daily alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the hour the alarm will sound.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the minute the alarm will sound.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished">AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished">PM</translation>
     </message>
     <message>
         <source>Days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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
@@ -1,826 +1,830 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>DateBook</name>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dia</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Localizar</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Semana</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mês</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>Hoje</translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation> minutos)</translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation>Calendário nao pode salvar
 suas modificações.
 Libere algum espaço e tente novamente.
 
 Sair assim mesmo?</translation>
     </message>
     <message>
         <source>Error!</source>
         <translation>Erro!</translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation>Conserte</translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation>(Desconhecido)</translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation>A duração do evento é potencialmente mais
 longa que o intervalo entre repetições.</translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation>Edit Event</translation>
     </message>
     <message>
         <source>Continue</source>
         <translation>Continuar</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Calendário</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Impossível editar dados durante sincronização</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Sem espaço</translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation>ListaSem</translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation>Duplicar Evento</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>Editar...</translation>
     </message>
     <message>
         <source>error box</source>
         <translation>caixa de erro</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>F</source>
         <translation>S</translation>
     </message>
     <message>
         <source>M</source>
         <translation>S</translation>
     </message>
     <message>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
         <source>T</source>
         <translation>Q</translation>
     </message>
     <message>
         <source>W</source>
         <translation>Q</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Sexta</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Segunda</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Domingo</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sábado</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Quarta</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Terça</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Silencioso</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00p</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>End</source>
         <translation>Fim</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Enviar</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Início</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>This is an all day event.</source>
         <translation>Este evento ocupa todo o dia.</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Horário</translation>
     </message>
     <message>
         <source> - </source>
         <translation> - </translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplicar</translation>
     </message>
     <message>
         <source>Beam this occurence</source>
         <translation>Enviar esta ocorrência</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation>:00 PM</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation>:00 AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Calendário</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Alarm Preset</source>
         <translation>Al. Padrão</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation>Horário de inicial dos eventos</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation> minutos</translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation>Hora Inicio:</translation>
     </message>
     <message>
         <source>Preferences</source>
         <translation>Preferências</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation>Configuração do Alarme</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Misc</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>Estilo de coluna:</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Padrão</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Médio</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Grande</translation>
     </message>
     <message>
         <source>Views</source>
         <translation>Vistas</translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation>Vista padrão:</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dia</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Semana</translation>
     </message>
     <message>
         <source>Week List</source>
         <translation>Lista Semanal</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mês</translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation>Ir para a hora corrente</translation>
     </message>
     <message>
         <source>Time display</source>
         <translation>Mostrar horário</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nenhum</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Início</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation>Início-Fim</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Padrões</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Localização:</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Escitório</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Residência</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoria:</translation>
     </message>
+    <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>
         <translation>s</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Jan-00. Jan</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
         <translation>MTWTFSSM</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstEvent</name>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Editar</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished">Duplicar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Apagar</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished">Enviar</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>s</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>S: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation>p</translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>No Repeat...</source>
         <translation>Sem Repetição...</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>Repetir...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>Diariamente...</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Calendário</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>Anualmente...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>Mensalmente...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>Semanalmente...</translation>
     </message>
     <message>
         <source>Start Time</source>
         <translation>Horário Inicial</translation>
     </message>
     <message>
         <source>End Time</source>
         <translation>Horário Final</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>Home</source>
         <translation>Resid</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Alto</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Almoço</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Alarme</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Reunião</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Não Repete...</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation> minutos</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Jantar</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Escritório</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Repetir</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Local</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Silenc</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Viagem</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>O Dia Todo</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Categoria</translation>
     </message>
     <message>
         <source>New Event</source>
         <translation>Novo Evento</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>Jan 02 00</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Zona Horária</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Descrição</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>Início - Fim</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Nota...</translation>
     </message>
     <message>
-        <source>Start Time</source>
-        <translation 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>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Editar Nota</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Almoço</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Every</source>
         <translation>Todo(a)</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 todo(a) </translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Todo(a) </translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Sexta</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Segunda</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Domingo</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sábado</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Quarta</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Terça</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>O(A) %1 a cada </translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>O(A) %1 %1 a cada</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Quinta</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Início</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Fim</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>nd</source>
         <translation>o(a)</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>o(a)</translation>
     </message>
     <message>
         <source>st</source>
         <translation>o(a)</translation>
     </message>
     <message>
         <source>th</source>
         <translation>o(a)</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>Day</source>
         <translation>Dia</translation>
     </message>
     <message>
         <source>day</source>
         <translation>dia</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>days</source>
         <translation>dias</translation>
     </message>
     <message>
         <source>week</source>
         <translation>semana</translation>
     </message>
     <message>
         <source>year</source>
         <translation>ano</translation>
     </message>
     <message>
         <source> and </source>
         <translation> e </translation>
     </message>
     <message>
         <source>month</source>
         <translation>mês</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>semanas</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
 e </translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, e </translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation>Sem Repetição</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>mês(es)</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>dia(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Repetir Por</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>semana(s)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>ano(s)</translation>
     </message>
     <message>
         <source>on </source>
         <translation>em</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Day</source>
         <translation>Dia</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Sex</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Seg</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sab</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Dom</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Qui</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Ter</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Qua</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nenhum</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Semana</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Ano</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Todo(a)</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mês</translation>
     </message>
     <message>
         <source>years</source>
         <translation>anos</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Sem Data Final</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Todo(a):</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Repetir Em</translation>
     </message>
     <message>
         <source>months</source>
         <translation>meses</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Termina Em:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Freqüência</translation>
     </message>
     <message>
         <source>Repeating Event </source>
         <translation>Evento Repetitivo </translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>WeekVar</translation>
     </message>
 </context>
 </TS>
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
@@ -1,270 +1,250 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation>Seleção de Comando</translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Comandos&lt;/B&gt;:</translation>
     </message>
     <message>
         <source>Commands</source>
         <translation>Comandos</translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Comandos Sugeridos&lt;/B&gt;:</translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Up</source>
         <translation>Acima</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nova</translation>
     </message>
     <message>
         <source>Tab</source>
         <translation>Aba</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Abaixo</translation>
     </message>
     <message>
-        <source>Font</source>
-        <translation 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>
         <source>Black on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>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>
         <source>Hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Pink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pink on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>new session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sessions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To exit fullscreen, tap here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History Lines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konsole </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Seleção de Comando</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Enter command to add:</source>
         <translation>Entre comando a adicionar:</translation>
     </message>
     <message>
         <source>Add command</source>
         <translation>Adicionar comando</translation>
     </message>
 </context>
 </TS>
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
@@ -1,101 +1,97 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>FifteenConfigDialog</name>
     <message>
         <source>All Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select board background</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FifteenConfigDialogBase</name>
     <message>
         <source>Configure Fifteen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use a Custom Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Path:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Preview:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Grid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Rows:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
 <context>
     <name>PiecesTable</name>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Quinze Peças</translation>
     </message>
     <message>
         <source>Congratulations!
 You win the game!</source>
         <translation>Parabéns!
 Você venceu o Jogo!</translation>
     </message>
     <message>
         <source>R&amp;andomize Pieces</source>
         <translation>&amp;Sortear Peças</translation>
     </message>
     <message>
         <source>&amp;Reset Pieces</source>
         <translation>&amp;Reiniciar Peças</translation>
     </message>
 </context>
 </TS>
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
@@ -1,57 +1,53 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>GoMainWidget</name>
     <message>
         <source>Game</source>
         <translation>Jogo</translation>
     </message>
     <message>
         <source>Pass</source>
         <translation>Passar</translation>
     </message>
     <message>
         <source>Two player option</source>
         <translation>Dois Jogadores</translation>
     </message>
     <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>
         <source>White wins.</source>
         <translation>Branco vence.</translation>
     </message>
     <message>
         <source>Prisoners: black %1, white %2</source>
         <translation>Pridioneiros: preto %1, branco %2</translation>
     </message>
     <message>
         <source>Black wins.</source>
         <translation>Preto Vence</translation>
     </message>
 </context>
 </TS>
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
@@ -1,297 +1,293 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>KRFBConnection</name>
     <message>
         <source>Host not found</source>
         <translation>Computador não localizado</translation>
     </message>
     <message>
         <source>Connected</source>
         <translation>Conectado</translation>
     </message>
     <message>
         <source>Connection Refused</source>
         <translation>Conexão Recusada</translation>
     </message>
     <message>
         <source>QSocket reported an invalid error code</source>
         <translation>QSocket reportou um código de erro inválido</translation>
     </message>
     <message>
         <source>Read Error: QSocket reported an error reading
 data, the remote host has probably dropped the
 connection.</source>
         <translation>Erro de Leitura: QSocket informou um erro lendo
 dados, o computador remoto provavelmente derrubou
 a conexão.</translation>
     </message>
 </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>
 <context>
     <name>KRFBLogin</name>
     <message>
         <source>Error: Invalid server version, %1</source>
         <translation>Erro: Versão do servidor inválida, %1</translation>
     </message>
     <message>
         <source>Waiting for server version...</source>
         <translation>Aguardando por versão do servidor...</translation>
     </message>
     <message>
         <source>Login Failed</source>
         <translation>Login Falhou</translation>
     </message>
     <message>
         <source>Error: The password you specified was incorrect.</source>
         <translation>A senha especificada estava incorreta.</translation>
     </message>
     <message>
         <source>Too many failures</source>
         <translation>Muitas Falhas</translation>
     </message>
     <message>
         <source>Error: Too many invalid login attempts have been made
 to this account, please try later.</source>
         <translation>Erro: Muitas tentativas inválidas de login foram feitas
 nesta conta. Por favor tente mais tarde.</translation>
     </message>
     <message>
         <source>Logged in</source>
         <translation>Conectado</translation>
     </message>
     <message>
         <source>Error: Unsupported server version, %1</source>
         <translation>Erro: Versão do servidor não suportada, %1</translation>
     </message>
     <message>
         <source>Error: This server requires a password, but none has been specified.
 </source>
         <translation>Erro: Este servidor requer uma senha, mas nenhuma foi especificada.
 </translation>
     </message>
 </context>
 <context>
     <name>KVNC</name>
     <message>
         <source>Connected to remote host</source>
         <translation>Conectado ao computador remoto</translation>
     </message>
     <message>
         <source>VNC Viewer</source>
         <translation>VNC Viewer</translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation>Tela Cheia</translation>
     </message>
     <message>
         <source>Stop Full Screen</source>
         <translation>Sair da tela cheia</translation>
     </message>
     <message>
         <source>Logged in to remote host</source>
         <translation>Conectado ao computador remoto</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>Desconectar</translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation>Conexão fechada</translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send Contrl-Alt-Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next Click is Double Click</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next Click is Right Click</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KVNCBookmarkDlgBase</name>
     <message>
         <source>Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose a bookmark that you would like to open</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KVNCConnDlgBase</name>
     <message>
         <source>VNC Viewer Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password:</source>
         <translation type="unfinished">Senha:</translation>
     </message>
     <message>
         <source>Bookmark Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host Name:</source>
         <translation type="unfinished">Nome do Computador:</translation>
     </message>
     <message>
         <source>Display Number:</source>
         <translation type="unfinished">Número da Tela:</translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check for screen updates every:</source>
         <translation type="unfinished">Verificar atualizações da tela a cada:</translation>
     </message>
     <message>
         <source>Milliseconds</source>
         <translation type="unfinished">Milisegundos</translation>
     </message>
     <message>
         <source>Request 8-bit session</source>
         <translation type="unfinished">Requisitar sessão 8-bits</translation>
     </message>
     <message>
         <source>Raise on bell</source>
         <translation type="unfinished">Trazer para frente com campainha</translation>
     </message>
     <message>
         <source>Request shared session</source>
         <translation type="unfinished">Requisitar sessão compartilhada</translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scale Factor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Encodings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hextile encoding</source>
         <translation type="unfinished">Codificação Hextile</translation>
     </message>
     <message>
         <source>CoRRE encoding</source>
         <translation type="unfinished">Codificação CoRRE</translation>
     </message>
     <message>
         <source>RRE encoding</source>
         <translation type="unfinished">RRE encoding</translation>
     </message>
     <message>
         <source>Copy rectangle encoding</source>
         <translation type="unfinished">Codificação copia de retângulo</translation>
     </message>
     <message>
         <source>The password of the VNC server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle obscuring the password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of the VNC server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The host name of the VNC server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The display number of the VNC server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delay between requesting updates from the server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Request that the VNC server transfer 8 bit color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Allow other users to connect to the VNC server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scale the remote display to fit on the PDA (Slow)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable transmiting identical rectangles as references to existing data</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,115 +1,87 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>BatteryStatus</name>
     <message>
         <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>
         <source>Remaing Power: %1 %2
 Remaining Time: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ipaq  %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,71 +1,68 @@
 <!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>
     </message>
     <message>
         <source>Stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
         <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>
     </message>
 </context>
 </TS>
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,1160 +1,728 @@
 <!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>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished">Semana</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished">Mês</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished">Ano</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished">
 A cada:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished">Frequência</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished">Termina Em:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">Sem Data Final</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">Repete Em</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">Seg</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">Ter</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">Qua</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">Qui</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">Sex</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">Sab</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">Dom</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">A cada</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished">Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished">WeekVar</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">Sem Data Final</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished">dias</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished">dia</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished">semanas</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished">semana</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished">meses</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished">mês</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished">anos</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished">ano</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished">e</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished">,
 e</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished">, e</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished">na(o)</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished">Sem repetição</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished">dia(s)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">Repete Em</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">Seg</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">Ter</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">Qua</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">Qui</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">Sex</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">Sab</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">Dom</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished">semana(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished">Repete por</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">Dia</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Data</translation>
     </message>
     <message>
         <source>month(s)</source>
         <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>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to edit the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to duplicate the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to delete the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to transmit the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</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">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>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoria:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation>E-mail Padrão:</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Escritório:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Página Web Comercial:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Telefone Comercial:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Fax Comercial:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Celular Comercial:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Pager Comercial:</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Pagina Web Pessoal:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Telefone Residencial:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Fax Residencial:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Celular Pessoal:</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation>Todos os E-mails:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Profissão:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Assistente:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Gerente:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Masculino</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Feminino</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Sexo:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Conjuge:</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Aniversário:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Casamento:</translation>
     </message>
     <message>
         <source>Children: </source>
         <translation>Crianças:</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Apelido:</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notas:</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation>Inicio:</translation>
     </message>
     <message>
         <source>End:</source>
         <translation>Fim:</translation>
     </message>
     <message>
         <source>Note:</source>
         <translation>Nota:</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>A cada</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 a cada</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>No(a) %1 de cada</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>A Cada</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Segunda</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Terça</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Quarta</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Quinta</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Sexta</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sábado</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Domingo</translation>
     </message>
     <message>
-        <source>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>
         <source>Low</source>
         <translation>Baixo</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation>Muito Baixo</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Localização:</translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation>Este evento dura todo o dia</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation>Este evento dura vários dias</translation>
     </message>
     <message>
-        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
-        <translation 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>
         <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profession</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Has a due-date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No due-date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No reccurrence</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No start-date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No completed-date</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>º</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>º</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>º</translation>
     </message>
     <message>
         <source>th</source>
         <translation>º</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/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,830 +1,175 @@
 <!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>
     </message>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished">Nome</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished">Tamanho</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Data</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished">Tipo Mime</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished">DiálogoArquivo</translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished">Abrir</translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished">Salvar</translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished">Nome:</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation type="unfinished">Estilo</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished">Tamanho</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished">The Quick Brown Fox Jumps Over The Lazy Dog</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="unfinished">Nome</translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished"></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="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
@@ -1,1048 +1,994 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation>Tudo</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Não Preenchido</translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation> (mult.)</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Negócios</translation>
     </message>
     <message>
         <source>Personal</source>
         <translation>Pessoal</translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation> (Mult.)</translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation>Todos</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>Nova Categoria</translation>
     </message>
     <message>
         <source>New Category </source>
         <translation>Nova Categoria </translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Add</source>
         <translation>Adicionar</translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation>Categorias Vão Aqui</translation>
     </message>
     <message>
         <source>Category Edit</source>
         <translation>Editar Categoria</translation>
     </message>
     <message>
         <source>Global</source>
         <translation>Global</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>Categorias</translation>
     </message>
     <message>
         <source>Application</source>
         <translation>Aplicação</translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation>Marque as categorias a que este documento pertence.</translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation>Entre a nova categoria aqui. Pressione &lt;b&gt;Adicionar&lt;&gt; para adicioná-la a lista.</translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation>Entre uma nova categoria à esquerda e pressione para adicioná-la a lista.</translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation>Pressione para remover a categoria destacada.</translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation>Marque para tornar esta propriedade disponível para todas as aplicações.</translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation>Tudo</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Não Preenchido</translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>All</source>
         <translation>Tudo</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation>Desculpe, outra aplicação está 
 editando as categorias.</translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation>Editar Categorias</translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation>Mostra Janeiro do ano selecionado</translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation>Mostra o mês anterior</translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation>Mostra o próximo mês</translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation>Mostra Dezembro do ano selecionado</translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation>Fechar Seletor de Arquivo</translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation>Mostrar documentos deste tipo</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Visualizador de Documentos</translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation>Mostrar documentos nesta categoria</translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation>Clique para selecionar um documento da lista</translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation>, ou selecione &lt;b&gt;Novo Documento&lt;/b&gt; para cliar um novo documento.</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation>&lt;br&gt;&lt;br&gt;Clique e segure para mostrar as propriedades do documento.</translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <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>
         <source>Start Search at:</source>
         <translation>Começar procura em:</translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation>Procurar p/ trás</translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation>Localizar:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoria:</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Sensível a caixa</translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation>Dez 02 01</translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>File deletion failed.</source>
         <translation>Remoção de arquivo falhou.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation>Cópia de </translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplicata</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>Cópia de arquivos falhou.</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Detalhes</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>Falhou ao mover Documento.</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Visualizador de Documentos</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Disco Rígido</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Propriedades</translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Beam</source>
         <translation>Enviar</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copia</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation>Carregamento rápido (consome memória)</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>Comentário:</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Localização:</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Detalhes</translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation>O meio em que o documento reside.</translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation>O nome deste documento.</translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation>Pré-carregue esta aplicação para que ela esteja disponível imediatamente.</translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation>Apagar este documento.</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation>Fazer uma cópia deste documento.</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation>Envia este documento para outro dispositivo.</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation>Usar rotação personalizada</translation>
     </message>
     <message>
         <source>Arguments:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>Informações sobre o Proprietário</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Entre a senha</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
 </context>
 <context>
     <name>QMessageBox</name>
     <message>
         <source>Yes</source>
         <translation>Sim</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Não</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Y</source>
         <translation>S</translation>
     </message>
     <message>
         <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>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation>Impossível agendar alarme.
 Libere algum espaço e tente novamente.</translation>
     </message>
     <message>
         <source>There was a problem creating
 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>
         <source>Unfiled</source>
         <translation>Não Preenchido</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Endereço Com.:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Endereço Res.:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation>Endereços de E-mail: </translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Fone Res.: </translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Fax Resid.: </translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Celular Pess.: </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Pág. Web Pessoal: </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Pág. Web Comercial: </translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Escritório: </translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Fone Comercial: </translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Fax Comercial: </translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Celular Comercial: </translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Pager Comercial: </translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Profissão: </translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Assistente: </translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Gerente: </translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Masc</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Fem</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Sexo: </translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Esposo(a): </translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Aniversário: </translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Aniv. de Casamento: </translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Apelido: </translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Título</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Nome</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Nome do Meio</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Sobrenome</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Sufixo</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Arquivar Como</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Título Prof</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Departamento</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Companhia</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Fone Comercial</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Fax Comercial</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Celular Comercial</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>E-mail Padrão</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>E-mails</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Fone Res</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Fax Resid</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Celular Pess</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Endereço Comercial</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Cidade Comercial</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>UF Comercial</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>CEP Comercial</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>País Comercial</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Pager Comercial</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Pág. Web Comercial</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Escritório</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Profissão</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Assistente</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Gerente</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Endereço Res</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Cidade Res</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>UF Res</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>CEP Res</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>país Res</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Pág. Web Pessoal</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Esposo(a)</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Sexo</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Aniversário</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Aniv. de Casamento</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Apelido</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Crianças</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Grupos</translation>
     </message>
     <message>
         <source>New Document</source>
         <translation>Novo Documento</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Seg</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Ter</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Qua</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Qui</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
         <source>Feb</source>
         <translation>Fev</translation>
     </message>
     <message>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
         <source>Apr</source>
         <translation>Abr</translation>
     </message>
     <message>
         <source>May</source>
         <translation>Mai</translation>
     </message>
     <message>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
         <source>Aug</source>
         <translation>Ago</translation>
     </message>
     <message>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
         <source>Oct</source>
         <translation>Out</translation>
     </message>
     <message>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
         <source>Dec</source>
         <translation>Dez</translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation 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>
     <message>
         <source>%1 document</source>
         <translation>%1 documento</translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation type="unfinished">Clique para fechar esta janela descartando as mudanças.</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation type="unfinished">Clique para fechar esta janela.</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation type="unfinished">Clique para fechar esta janela e salvar as mudanças.</translation>
     </message>
     <message>
         <source>Click to make this window movable.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
         <translation type="unfinished">Marque para que esta janela ocupe toda a área da tela.</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maximize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>Disco Rígido SCSI</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Armazenamento Interno</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>Cartão SD</translation>
     </message>
     <message>
         <source>CF Card</source>
         <translation>Cartão CF</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Disco Rígido</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>Memória Interna</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>Cartão MMC</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>Nenhum</translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation>executável citytime não encontrado</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation>paraselecionar o fuso-horário,
 instale o aplicativo citytime.</translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Impossível agendar alarme.
 Por Favor libere algum espaço e tente novamente</translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation>Sem Espaço</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>%1 arquivos</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>%1 %2</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>Todos os %1 arquivos</translation>
     </message>
     <message>
         <source>All files</source>
         <translation>Todos os arquivos</translation>
     </message>
 </context>
 <context>
     <name>WindowDecoration</name>
     <message>
         <source>Default</source>
         <comment>List box text for default window decoration</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,49 +1,37 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>MindBreaker</name>
     <message>
         <source>New Game</source>
         <translation>Novo Jogo</translation>
     </message>
     <message>
         <source>win avg: %1 turns (%2 games)</source>
         <translation>méd. vitórias: %1 turnos (%2 jogos)</translation>
     </message>
     <message>
         <source>Mind Breaker</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MindBreakerBoard</name>
     <message>
         <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,38 +1,34 @@
 <!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>
         <source>Advanced</source>
         <translation>Avançado</translation>
     </message>
     <message>
         <source>Beginner</source>
         <translation>Iniciante</translation>
     </message>
     <message>
         <source>Mine Sweep</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,300 +1,328 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BaseSetup</name>
     <message>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slideshow timeout:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Toggle autoscale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to next image</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Delete Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Image Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></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>Browser Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Keyboard Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie Eye - Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Imageinfo Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Imageview Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Go dir up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start slideshow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and Imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show images fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto rotate images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show images unscaled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show zoomer window when unscaled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
     <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>
         <source>&lt;center&gt;&lt;b&gt;Be carefull with the following options!&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show files recursive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recursion depth:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Digital Camera View</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Name Only</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>imageinfo</name>
     <message>
         <source>View Full Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays an thumbnail of the image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays info of selected image</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,817 +1,878 @@
 <!DOCTYPE TS><TS>
 <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>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerUI</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposeMail</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please create an SMTP account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a File.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Store message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Store message into drafts?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Attachments will not be stored in &quot;Draft&quot; folder&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Receiver specified</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposeMailUI</name>
     <message>
         <source>Compose Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>send later</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>use:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BCC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <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>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>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete the selected Account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select an account.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccountsUI</name>
     <message>
         <source>Configure Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>News</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IMAPconfigUI</name>
     <message>
         <source>Configure IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefix</source>
         <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>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>
     </message>
     <message>
         <source>Send queued mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show/Hide folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Newsgroups</source>
         <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>
     </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>
 <context>
     <name>NNTPconfigUI</name>
     <message>
         <source>Configure NNTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Newsgroup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get newsgroup list from server</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Newmdirdlgui</name>
     <message>
         <source>Enter directory name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directory name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directory contains other subdirs</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <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>
     </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>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></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>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec imapd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>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>
     </message>
     <message>
         <source>Use Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the SMTP Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port of the SMTP Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SelectMailTypeUI</name>
     <message>
         <source>Select Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Account Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>POP3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SMTP</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SettingsDialogUI</name>
     <message>
         <source>Settings Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View mail as Html</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compose Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mails later ( enqueue in outbox )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></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>
     </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>
     </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>
     </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>
     </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>
     </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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Store mail(s) to&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Folder:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create new folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefix will prepend, no need to enter it!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move mail(s)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,98 +1,74 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>CanvasCardWindow</name>
     <message>
         <source>Play</source>
         <translation>Jogar</translation>
     </message>
     <message>
         <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>
         <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>
         <source>Snap to position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Turn one card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Turn three cards</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -22,405 +22,393 @@
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation type="unfinished"></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>
 <context>
     <name>FirstUse</name>
     <message>
         <source>&lt;&lt; Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next &gt;&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap anywhere on the screen to continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait, loading %1 settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finish</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputMethods</name>
     <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>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>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>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>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scan whole media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation type="unfinished"></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>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Server</name>
     <message>
         <source>USB Lock</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Critical Memory Shortage
 Please end this application
 immediately.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WARNING</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The battery is running very low. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The Back-up battery is very low&lt;p&gt;Please charge the back-up battery</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Shutdown...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Allow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade or change the security setting to use IntelliSync.</source>
         <translation type="unfinished"></translation>
     </message>
     <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
@@ -1,321 +1,245 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>LoginBase</name>
     <message>
         <source>LoginBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you select this option, opie-login will automagically log you in with the user you have selected in the drop-down list.  
 
 For the Zaurus 5x00 this is always the user &quot;root&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This drop-down list allows you to select the user for auto-login
 (if enabled above).  
 
 You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MultiauthConfig</name>
     <message>
         <source>Security configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the order they will appear in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>Any</source>
         <translation type="unfinished">Qualquer</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Nenhum</translation>
     </message>
     <message>
         <source>Important notice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Locking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></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-securityplugin-*&lt;/em&gt; package! Once you have done that, you will be able to configure your PDA protection here.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MultiauthGeneralConfig</name>
     <message>
         <source>When to lock Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on Opie start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on Opie resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Multiple plugins authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Required successes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Don&apos;t protect this config screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show explanatory screens</source>
         <translation type="unfinished"></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>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You must save your current settings before trying to authenticate. Press OK to accept and launch a simulated authentication process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you don&apos;t like the result of this test, don&apos;t forget to change your settings before you exit the configuration application!</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>
     </message>
     <message>
         <source>Select a net-range or enter a new one.  
 
 This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
 
 For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
 
 The entry &quot;All&quot; will allow *any* IP to connect. 
 The entry &quot;None&quot; will *deny* any connection.  
 
 If unsure, select &quot;Any&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the selected net range from the list
 
 If you press this button, the currently selected net range will be deleted from the list of net ranges.
 
 If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
 the list to the state it has been when you initially booted your Zaurus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button will restore the list of net ranges
 to the defaults.
 
 Beware that all manually entered net ranges will be lost!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select your sync software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Qtopia 1.7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie 1.0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IntelliSync</source>
         <translation type="unfinished"></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="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,52 +1,44 @@
 <!DOCTYPE TS><TS>
 <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
@@ -1,147 +1,143 @@
 <!DOCTYPE TS><TS>
 <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>
         <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>
         <translation>Hoje</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
         <translation>Hoje por Maximilian Reiss</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>Clique aqui para abrir o diálogo de configuração</translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>Caregar os plugins em que ordem:</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>Sobe</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>Desce</translation>
     </message>
     <message>
         <source>active/order</source>
         <translation>ativos/ordem</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Misc</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>Marque uma caixa de verificação para ativar/desativar um plugin ou use os botões com as flexas na direita para mudar a ordem de apresentação</translation>
     </message>
     <message>
         <source>Today Config</source>
         <translation>Hoje Configuração</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>Marque aqui para iniciar o Hoje ao ativar o dispositivo.</translation>
     </message>
     <message>
         <source>autostart on resume?</source>
         <translation>autoiniciar ao ativar ?</translation>
     </message>
     <message>
         <source>tiny banner</source>
         <translation>faixa pequena</translation>
     </message>
     <message>
         <source>Have small banner </source>
         <translation>Usar uma faixa pequena</translation>
     </message>
     <message>
         <source> min</source>
         <translation> min</translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
         <translation>Quantos minutos seu PDA tem que permacer suspenso antes que o autoinício seja lançado ao ativar</translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation>minutos inativos</translation>
     </message>
     <message>
         <source> pixel</source>
         <translation> pixel</translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
         <translation>Tamanho do ícone em pixel</translation>
     </message>
     <message>
         <source>icon size</source>
         <translation>tamanho do icone</translation>
     </message>
     <message>
         <source> sec</source>
         <translation> sec</translation>
     </message>
     <message>
         <source>never</source>
         <translation>nunca</translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
         <translation>Freqüencia com que o Hoje deve se atualizar</translation>
     </message>
     <message>
         <source>refresh</source>
         <translation>atualizar</translation>
     </message>
 </context>
 </TS>
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
@@ -1,654 +1,566 @@
 <!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 %1&lt;/h1&gt;&lt;br&gt;</source>
         <translation>&lt;h1&gt;Alarme às %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">Não preenchido</translation>
     </message>
 </context>
 <context>
     <name>NewTaskDlg</name>
     <message>
         <source>New Task</source>
         <translation type="unfinished">Nova Tarefa</translation>
     </message>
     <message>
         <source>Blank task</source>
         <translation type="unfinished"></translation>
     </message>
     <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>Information</source>
         <translation>Informação</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Estado</translation>
     </message>
     <message>
         <source>Recurrence</source>
         <translation>Recorrente</translation>
     </message>
     <message>
         <source>Task Editor</source>
         <translation>Editor de Tarefas</translation>
     </message>
 </context>
 <context>
     <name>Opie</name>
     <message>
         <source>Todo List</source>
         <translation type="unfinished">Lista de Tarefas</translation>
     </message>
     <message>
         <source>Task</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
         <translation>Entre a Tarefa</translation>
     </message>
     <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>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Remover</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation>Novo Modelo %1</translation>
     </message>
     <message>
         <source>Click here to set the priority of new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Clique aqui para mudar a prioridade de uma nova tarefa.
 
 Esta área é chamada de barra de tarefas rápida.
 
 Ela permite que você adicione rapidamente uma nova tarefa a sua lista.  Esta coluna pode ser mostrada ou ocultada selecionando-se Opções-&gt;&apos;Mostrar barra de tarefas rápida&apos; no menu acima.</translation>
     </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>Entre com a descrição de uma nova tarefa aqui.
 
 Esta área é chamada de barra de tarefas rápida.
 
 Ela permite que você adicione rapidamente uma nova tarefa a sua lista.  Esta coluna pode ser mostrada ou ocultada selecionando-se Opções-&gt;&apos;Mostrar barra de tarefas rápida&apos; no menu acima.</translation>
     </message>
     <message>
         <source>More</source>
         <translation>Mais</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>Clique aqui para inserir informações adicionais para uma nova tarefa.
 
 Esta área é chamada de barra de tarefas rápida.
 
 Ela permite que você adicione rapidamente uma nova tarefa a sua lista.  Esta coluna pode ser mostrada ou ocultada selecionando-se Opções-&gt;&apos;Mostrar barra de tarefas rápida&apos; no menu acima.</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Entrar</translation>
     </message>
     <message>
         <source>Click here to add new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Clique aqui para adicionar uma nova tarefa.
 
 Esta área é chamada de barra de tarefas rápida.
 
 Ela permite que você adicione rapidamente uma nova tarefa a sua lista.  Esta coluna pode ser mostrada ou ocultada selecionando-se Opções-&gt;&apos;Mostrar barra de tarefas rápida&apos; no menu acima.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
         <source>Click here to reset new task information.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Clique aqui para limpar as informações de uma nova tarefa.
 
 Esta área é chamada de barra de tarefas rápida.
 
 Ela permite que você adicione rapidamente uma nova tarefa a sua lista.  Esta coluna pode ser mostrada ou ocultada selecionando-se Opções-&gt;&apos;Mostrar barra de tarefas rápida&apos; no menu acima.</translation>
     </message>
     <message>
         <source>Data can not be edited, currently syncing</source>
         <translation>Dados não podem ser editados. Sincronização em andamento</translation>
     </message>
     <message>
         <source>Data can&apos;t be edited, currently syncing</source>
         <translation>Dados não podem ser editados. Sincronização em andamento</translation>
     </message>
     <message>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>Table View</source>
         <translation>Visão em tabela</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nenhum</translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation>%1 dia(s)</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>hora</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Description:</source>
         <translation>Descrição:</translation>
     </message>
     <message>
         <source>Enter brief description of the task here.</source>
         <translation>Entre um breve descrição da tarefa aqui.</translation>
     </message>
     <message>
         <source>Complete </source>
         <translation>Completa</translation>
     </message>
     <message>
         <source>Work on </source>
         <translation>Trabalhar em</translation>
     </message>
     <message>
         <source>Buy </source>
         <translation>Comprar</translation>
     </message>
     <message>
         <source>Organize </source>
         <translation>Organizar</translation>
     </message>
     <message>
         <source>Get </source>
         <translation>Obter</translation>
     </message>
     <message>
         <source>Update </source>
         <translation>Atualizar</translation>
     </message>
     <message>
         <source>Create </source>
         <translation>Criar</translation>
     </message>
     <message>
         <source>Plan </source>
         <translation>Planejar</translation>
     </message>
     <message>
         <source>Call </source>
         <translation>Chamar</translation>
     </message>
     <message>
         <source>Mail </source>
         <translation>Correio</translation>
     </message>
     <message>
         <source>Select priority of task here.</source>
         <translation>Selecione Prioridade da tarefa aqui.</translation>
     </message>
     <message>
         <source>Very High</source>
         <translation>Muito Alta</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Alta</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Baixa</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>Muito Baixa</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoria:</translation>
     </message>
     <message>
         <source>Select category to organize this task with.</source>
         <translation>Selecione categoria onde incluir esta tarefa.</translation>
     </message>
     <message>
         <source>Recurring task</source>
         <translation>Tarefa recorrente</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>Clique aqui se esta tarefa ocorre regularmente. Se selecionado a frquência poderá ser ajustada na guia de recursão.</translation>
     </message>
     <message>
         <source>Enter any additional information about this task here.</source>
         <translation>Entre qualquer informação adicional aqui.</translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation>Lista de Tarefas</translation>
     </message>
     <message>
         <source>Summary:</source>
         <translation>Sumário:</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorStatus</name>
     <message>
         <source>Status:</source>
         <translation>Estado:</translation>
     </message>
     <message>
         <source>Click here to set the current status of this task.</source>
         <translation>Clique aqui para mudar o estado atual desta tarefa.</translation>
     </message>
     <message>
         <source>Started</source>
         <translation>Iniciada</translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation>Adiada</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>Terminada</translation>
     </message>
     <message>
         <source>Not started</source>
         <translation>Não Iniciada</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Progresso:</translation>
     </message>
     <message>
         <source>Select progress made on this task here.</source>
         <translation>Selecione o progresso feito nesta tarefa.</translation>
     </message>
     <message>
         <source>0 %</source>
         <translation>0 %</translation>
     </message>
     <message>
         <source>20 %</source>
         <translation>20 %</translation>
     </message>
     <message>
         <source>40 %</source>
         <translation>40 %</translation>
     </message>
     <message>
         <source>60 %</source>
         <translation>60 %</translation>
     </message>
     <message>
         <source>80 %</source>
         <translation>80 %</translation>
     </message>
     <message>
         <source>100 %</source>
         <translation>100 %</translation>
     </message>
     <message>
         <source>Start Date:</source>
         <translation>Data de Início:</translation>
     </message>
     <message>
         <source>Click here to set the date this task was started.</source>
         <translation>Clique aqui para selecionar a data em que esta tarefa foi iniciada.</translation>
     </message>
     <message>
         <source>Due Date:</source>
         <translation>Data para Término:</translation>
     </message>
     <message>
         <source>Click here to set the date this task needs to be completed by.</source>
         <translation>Clique aqui para selecionar a data em que esta tarefa foi completada.</translation>
     </message>
     <message>
         <source>Completed:</source>
         <translation>Completada:</translation>
     </message>
     <message>
         <source>Click here to mark this task as completed.</source>
         <translation>Clique aqui para marcar esta tarefa como completa.</translation>
     </message>
     <message>
         <source>Click here to set the date this task was completed.</source>
         <translation>Clique aqui para selecionar a data em que esta tarefa foi completada.</translation>
     </message>
     <message>
         <source>Maintainer Mode:</source>
         <translation>Modo de Manutenção:</translation>
     </message>
     <message>
         <source>Click here to set the maintainer&apos;s role.</source>
         <translation>Clique aqui para selecionar o papel de mantenedor.</translation>
     </message>
     <message>
         <source>Nothing</source>
         <translation>Nada</translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation>Responsável</translation>
     </message>
     <message>
         <source>Done By</source>
         <translation>Feito Por</translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation>Coordenando</translation>
     </message>
     <message>
         <source>Maintainer:</source>
         <translation>Mantenedor:</translation>
     </message>
     <message>
         <source>This is the name of the current task maintainer.</source>
         <translation>Este é o nome do mantenedor desta tarefa.</translation>
     </message>
     <message>
         <source>test</source>
         <translation>teste</translation>
     </message>
     <message>
         <source>Click here to select the task maintainer.</source>
         <translation>Clique aqui para selecionar o mantenedor da tarefa.</translation>
     </message>
 </context>
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,832 +1,566 @@
 <!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>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <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>
         <source>&amp;Import text file</source>
         <translation>Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
         <translation>Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
         <translation>&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation 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>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation 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>
         <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
         <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
         <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
         <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
         <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
         <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
         <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
         <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
         <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
         <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
         <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
         <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
         <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
         <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
         <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
         <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
-        <source>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>
         <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No document defined.
 You have to create a new document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to save </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 before continuing?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Now you have to enter
 a password twice for your
 newly created document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&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>
         <source>&lt;P&gt;You must create a new document first. Ok to create?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Password Manager&lt;br&gt;ZSafe version 2.1.2&lt;br&gt;&lt;/b&gt;by Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Translations by Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,567 +1,487 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation>Полное имя</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Контакт</translation>
     </message>
     <message>
         <source>Pick</source>
         <translation>Выбрать</translation>
     </message>
 </context>
 <context>
     <name>AbView</name>
     <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>
         <source>&amp;Yes</source>
         <translation>&amp;Да</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;Нет</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>Добавить контакт?</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <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>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Не могу записать информацию.
 Освободите место 
 и попробуйте снова.
 Все равно выйти? </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>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Configuration</source>
         <translation>Конфигурация</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Смешанное</translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation>Настройки поиска</translation>
     </message>
     <message>
         <source>Query Style</source>
         <translation>Стиль запроса</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>Выражения</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>Шаблоны (*,?)</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Чувствителен к регистру</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Шрифт</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Мелкий</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Средний</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Крупный</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Почта</translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation>Предпочитать Qt-Mail</translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation>Предпочитать Opie-Mail</translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation>Замечание: QT-Mail предоставляется
 по умолчанию фирмой SHARP.
 Opie-Mail - свободная программа!</translation>
     </message>
     <message>
         <source>Order</source>
         <translation>Порядок</translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation>Выберите порядок контактов:</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Выше</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Ниже</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Добавить</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Удалить</translation>
     </message>
     <message>
         <source>Click on tab to select one</source>
         <translation>Щелкните на  вкладке для выбора</translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation>Установки очереди поиска</translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation>Окно поиска ожидает регулярное выражение если выбрано</translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
         <translation>Окно поиска только ожидает простые групповые символы</translation>
     </message>
     <message>
         <source>If selected, search differs between upper and lower chars</source>
         <translation>Если выбрано, поиск различает большие и маленькие буквы</translation>
     </message>
     <message>
         <source>Font size for list- and card view</source>
         <translation>Размер шрифта для списков и карточек</translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
         <translation>Выбор шрифта для списков и карточек</translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation>Использовать почтовый клиент SHARP, если есть</translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</source>
         <translation>Использовать почтовый клиент OPIE, если есть</translation>
     </message>
     <message>
         <source>Move selected attribute one line up</source>
         <translation>Переместить выбранный атрибут на строку вверх</translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation>Переместить выбранный атрибут на строку вниз</translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation>Список доступных атрибутов</translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation>Все выбранные атрибуты из списка внизу в список вверху</translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation>Удалить выбранный атрибут из верхнего списка</translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation>Порядок (верх-низ) определяет первый контакт в списке</translation>
     </message>
     <message>
         <source>Tool-/Menubar</source>
         <translation>Инстументы-/Меню</translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation>Фиксированное</translation>
     </message>
     <message>
         <source>Switch to fixed menu-/toolbars after restarting application !</source>
         <translation>Переключитесь в режим фиксированных меню/панелей после перезапуска приложения !</translation>
     </message>
     <message>
         <source>Moveable</source>
         <translation>Перемещаемое</translation>
     </message>
     <message>
         <source>Switch to moveable menu-/toolbars after restarting application !</source>
         <translation>Переключитесь в режим перемещаемых меню/панелей после перезапуска приложения !</translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Full Name...</source>
         <translation>Полное имя...</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Должность</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Организация</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Показать как</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Категория</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Заметки...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Общие</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Рабочий</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Домашний</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Адрес</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Город</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Область</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>Индекс</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>Страна</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>США</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Соединенное Королевство</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation>Албания</translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation>Алжир</translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation>Американское Самоа</translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation>Андорра</translation>
     </message>
     <message>
         <source>Angola</source>
         <translation>Ангола</translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation>Ангулем</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>Аргентина</translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation>Аруба</translation>
     </message>
     <message>
         <source>Australia</source>
         <translation>Австралия</translation>
     </message>
     <message>
         <source>Austria</source>
         <translation>Австрия</translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation>Азербайджан</translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation>Багамы</translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation>Бахрейн</translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation>Бангладеш</translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation>Барбадос</translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation>Беларусь</translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation>Бельгия</translation>
     </message>
     <message>
         <source>Belize</source>
         <translation>Белиз</translation>
     </message>
     <message>
         <source>Benin</source>
         <translation>Бенин</translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation>Бермуды</translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation>Бутан</translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation>Ботсвана</translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation>Остров Буве</translation>
     </message>
     <message>
         <source>Brazil</source>
         <translation>Бразилия</translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
         <translation>Бруней-Даруссалам</translation>
     </message>
     <message>
         <source>Bulgaria</source>
         <translation>Болгария</translation>
     </message>
     <message>
         <source>Burkina Faso</source>
         <translation>Буркина-Фасо</translation>
     </message>
     <message>
         <source>Burundi</source>
         <translation>Butundi</translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation>Камбоджия</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>Канада</translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation>Зеленый Мыс</translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation>Каймановы о-ва</translation>
     </message>
     <message>
         <source>Chad</source>
         <translation>Чад</translation>
     </message>
     <message>
         <source>Chile</source>
@@ -1010,552 +930,385 @@ Opie-Mail - свободная программа!</translation>
     <message>
         <source>Puerto Rico</source>
         <translation>Пуэрто Рико</translation>
     </message>
     <message>
         <source>Qatar</source>
         <translation>Катар</translation>
     </message>
     <message>
         <source>Reunion</source>
         <translation>Реюньон</translation>
     </message>
     <message>
         <source>Romania</source>
         <translation>Румыния</translation>
     </message>
     <message>
         <source>Russia</source>
         <translation>Россия</translation>
     </message>
     <message>
         <source>Rwanda</source>
         <translation>Руанда</translation>
     </message>
     <message>
         <source>Saint Lucia</source>
         <translation>С.-Люсия</translation>
     </message>
     <message>
         <source>Samoa</source>
         <translation>Самоа</translation>
     </message>
     <message>
         <source>San Marino</source>
         <translation>Сан Марино</translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
         <translation>Саудовская Аравия</translation>
     </message>
     <message>
         <source>Senegal</source>
         <translation>Сенегал</translation>
     </message>
     <message>
         <source>Seychelles</source>
         <translation>Сейшельские</translation>
     </message>
     <message>
         <source>Sierra Leone</source>
         <translation>Сьерра Лионе</translation>
     </message>
     <message>
         <source>Singapore</source>
         <translation>Сингапур</translation>
     </message>
     <message>
         <source>Slovakia</source>
         <translation>Словакия</translation>
     </message>
     <message>
         <source>Slovenia</source>
         <translation>Словения</translation>
     </message>
     <message>
         <source>Solomon Islands</source>
         <translation>Соломоновы о-ва</translation>
     </message>
     <message>
         <source>Somalia</source>
         <translation>Сомали</translation>
     </message>
     <message>
         <source>South Africa</source>
         <translation>ЮАР</translation>
     </message>
     <message>
         <source>Spain</source>
         <translation>Испания</translation>
     </message>
     <message>
         <source>Sri Lanka</source>
         <translation>Шри Ланка</translation>
     </message>
     <message>
         <source>St. Helena</source>
         <translation>Св. Елены о-ва</translation>
     </message>
     <message>
         <source>Sudan</source>
         <translation>Судан</translation>
     </message>
     <message>
         <source>Suriname</source>
         <translation>Суринам</translation>
     </message>
     <message>
         <source>Swaziland</source>
         <translation>Свазиленд</translation>
     </message>
     <message>
         <source>Sweden</source>
         <translation>Швеция</translation>
     </message>
     <message>
         <source>Switzerland</source>
         <translation>Швейцария</translation>
     </message>
     <message>
         <source>Taiwan</source>
         <translation>Тайвань</translation>
     </message>
     <message>
         <source>Tajikistan</source>
         <translation>Таджикистан</translation>
     </message>
     <message>
         <source>Tanzania</source>
         <translation>Танзания</translation>
     </message>
     <message>
         <source>Thailand</source>
         <translation>Тайланд</translation>
     </message>
     <message>
         <source>Togo</source>
         <translation>Того</translation>
     </message>
     <message>
         <source>Tokelau</source>
         <translation>Токелау</translation>
     </message>
     <message>
         <source>Tonga</source>
         <translation>Тонга</translation>
     </message>
     <message>
         <source>Tunisia</source>
         <translation>Тунис</translation>
     </message>
     <message>
         <source>Turkey</source>
         <translation>Турция</translation>
     </message>
     <message>
         <source>Turkmenistan</source>
         <translation>Туркменистан</translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation>Тувалу</translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation>Уганда</translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation>Украина</translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation>Уругвай</translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation>Узбекистан</translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation>Вануату</translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation>Венесуэла</translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation>Виргинские о-ва</translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation>Западная Сахара</translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation>Йемен</translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation>Югославия</translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation>Замбия</translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation>Зимбабве</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>День рождения</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Годовщина</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Пол</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Муж</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Жен</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Детали</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>Введите заметки</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>Редактировать имя</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Имя</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Отчество</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Фамилия</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Суффикс</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Контакты</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Неизвестно</translation>
     </message>
     <message>
         <source>Afghanistan</source>
         <translation>Афганистан</translation>
     </message>
     <message>
         <source>Antarctica</source>
         <translation>Антарктика</translation>
     </message>
     <message>
         <source>Armenia</source>
         <translation>Армения</translation>
     </message>
     <message>
         <source>Bolivia</source>
         <translation>Боливия</translation>
     </message>
     <message>
         <source>Cameroon</source>
         <translation>Камерун</translation>
     </message>
     <message>
         <source>Ghana</source>
         <translation>Гана</translation>
     </message>
     <message>
         <source>Guadeloupe</source>
         <translation>Гваделупа</translation>
     </message>
     <message>
         <source>Guinea-Bissau</source>
         <translation>Гвинея-Бисау</translation>
     </message>
     <message>
         <source>Jamaica</source>
         <translation>Ямайка</translation>
     </message>
     <message>
         <source>Kiribati</source>
         <translation>Кирибати</translation>
     </message>
     <message>
         <source>Kyrgyzstan</source>
         <translation>Киргизстан</translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
         <translation>Палестинские независимые территории</translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
         <translation>Питкернские о-ва</translation>
     </message>
     <message>
         <source>Vietnam</source>
         <translation>Вьетнам</translation>
     </message>
     <message>
         <source>Press to enter last- middle and firstname</source>
         <translation>Нажать для ввода ФИО</translation>
     </message>
     <message>
         <source>Enter fullname directly ! If you have a lastname with multiple words ( for instance &quot;de la Guerra&quot;), please write &lt;lastname&gt;,&lt;firstnames&gt; like this: &quot;de la Guerra, Carlos Pedro&quot;</source>
         <translation>Введите полное имя ! Если у вас фамилия из нескольких слов (например &quot;de la Guerra&quot;), пожалуйста введите &lt;lastname&gt;,&lt;firstnames&gt; таким образом:&quot;de la Guerra, Carlos Pedro&quot; </translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation>Работа...</translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation>Что-нибудь типа &quot;jr.&quot;..</translation>
     </message>
     <message>
         <source>The working place of the contact</source>
         <translation>Место работы контакта</translation>
     </message>
     <message>
         <source>Press to select attribute to change</source>
         <translation>Нажать для выбора изменяемого атрибута</translation>
     </message>
     <message>
         <source>Press to select how to store the name (and howto show it in the listview)</source>
         <translation>Нажать для выбора, как записывать имя и как его показывать</translation>
     </message>
     <message>
         <source></source>
         <translation></translation>
     </message>
 </context>
 <context>
     <name>Opie</name>
     <message>
         <source>Contact</source>
         <translation>Контакт</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Контакты</translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation>Начать поиск</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation>Написать письмо</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation>Импорт vCard</translation>
     </message>
     <message>
         <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
@@ -1,463 +1,360 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>AdvancedFm</source>
         <translation>ФайлМенеджер</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Файл</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Вид</translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation>Показать скрытые файлы</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>Создать каталог</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Переименовать</translation>
     </message>
     <message>
         <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>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Да</translation>
     </message>
     <message>
         <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>
         <source>Ir sent.</source>
         <translation>ИК отправлено.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Да</translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>Сменить каталог</translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>Запустить</translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation>Открыть как текст</translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation>Сделать ссылку</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Копировать</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>Переместить</translation>
     </message>
     <message>
         <source>File Info</source>
         <translation>Инф. о файле</translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation>Установить права</translation>
     </message>
     <message>
         <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>
         <source>&lt;p&gt;Cannot remove current directory from bookmarks. It is not bookmarked!&lt;/p&gt;</source>
         <translation>&lt;p&gt;Не могу убрать текущий каталог из закладок. Нету такой закладки!&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Refresh</source>
         <translation>Обновить</translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1 files?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Действительно удалить %1 файлов?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1 and all it&apos;s contents?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Действительно удалить %1 и все содержимое?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Действительно удалить %1?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Really copy %1 files?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Действительно копировать %1 файлов?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 already  exists. Ok to overwrite?&lt;/P&gt;</source>
         <translation>&lt;p&gt;%1 уже  существует. Переписать?&lt;/P&gt;</translation>
     </message>
     <message>
         <source>&lt;P&gt;Could not copy %1 to %2&lt;/P&gt;</source>
         <translation>&lt;P&gt;Не могу скопировать %1 в %2&lt;/P&gt;</translation>
     </message>
     <message>
         <source>Copy %1 As</source>
         <translation>Копировать %1 как</translation>
     </message>
     <message>
         <source>&lt;P&gt; %1 already exists. Ok to overwrite?&lt;/p&gt;</source>
         <translation>&lt;P&gt;%1 уже существует. Переписать?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not copy %1 to %2&lt;/P&gt;</source>
         <translation>&lt;p&gt;Не могу скопировать %1 в %2&lt;/P&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt; %1 already exists. Do you really want to delete it?&lt;/P&gt;</source>
         <translation>&lt;p&gt; %1 уже существует. Удалить его?&lt;/P&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not move %1&lt;/p&gt;</source>
         <translation>&lt;p&gt;Не могу переместить %1&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not copy %1 to %2&lt;/p&gt;</source>
         <translation>&lt;p&gt;Не могу скопировать %1 в %2&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Сохранить вывод в файл (только имя)</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Вывод</translation>
     </message>
     <message>
         <source>Process could not start</source>
         <translation>Процесс не смог запуститься</translation>
     </message>
     <message>
         <source>Error
 </source>
         <translation>Ошибка</translation>
     </message>
     <message>
         <source>
 Finished
 </source>
         <translation>
 Завершен
 </translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Установить права на файл</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Установить права на файл для:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>владелец</translation>
     </message>
     <message>
         <source>group</source>
         <translation>группа</translation>
     </message>
     <message>
         <source>others</source>
         <translation>прочие</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Владелец</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Группа</translation>
     </message>
     <message>
         <source>read</source>
         <translation>чтение</translation>
     </message>
     <message>
         <source>write</source>
         <translation>запись</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>выполнение</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Предупреждение</translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation>Ошибка- нет пользователя</translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation>Ошибка- нет  группы</translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation>Ошибка настройки владения или группы</translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation>Ошибка настройки режима</translation>
     </message>
     <message>
         <source>filePermissions</source>
         <translation>файлПраваДоступа</translation>
     </message>
 </context>
 </TS>
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
@@ -1,293 +1,233 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Appearance</name>
     <message>
         <source>Settings...</source>
         <translation>Настройка...</translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation>Текущая схема</translation>
     </message>
     <message>
         <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>
         <source>Drop down list</source>
         <translation>Список</translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation>Список / Иконки</translation>
     </message>
     <message>
         <source>Top</source>
         <translation>Вверху</translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation>Внизу</translation>
     </message>
     <message>
         <source>Style</source>
         <translation>Стиль</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Шрифт</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Цвета</translation>
     </message>
     <message>
         <source>Windows</source>
         <translation>Окна</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Дополнительно</translation>
     </message>
     <message>
-        <source>Restart</source>
-        <translation 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>Конфигурируем выбранный стиль.
 
 Замечание: Доступно не для всех стилей.</translation>
     </message>
     <message>
         <source>Window decorations control the way the application title bar and its buttons appear.
 
 Click here to select an available decoration.</source>
         <translation>Декорации окон программ - заголовок и кнопки.
 
 Щелкните, чтобы выбрать доступные декорации.</translation>
     </message>
     <message>
         <source>Select the desired name, style and size of the default font applications will use.</source>
         <translation>Выберите имя, стиль, размер шрифта, используемого программами.</translation>
     </message>
     <message>
         <source>Color schemes are a collection of colors which are used for various parts of the display.
 
 Click here to select an available scheme.</source>
         <translation>Цветовые схемы - это коллекция цветов, используемых различными частями экрана.
 
 Щелкните для выбора доступной схемы.</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation>Щелкните, чтобы вкладки были вверху окна.</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation>Щелкните, чтобы вкладки были внизу окна.</translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation>Предварительный просмотр. Посмотрите, что Вы изменили.</translation>
     </message>
     <message>
         <source>Appearance Settings</source>
         <translation>Установки Внешнего вида</translation>
     </message>
     <message>
         <source>Rotation direction:</source>
         <translation>Направление поворота:</translation>
     </message>
     <message>
         <source>Show Scrollbars on the left</source>
         <translation>Полоса прокрутки слева</translation>
     </message>
     <message>
         <source>Click here to display scrollbars on the left side instead of the right.</source>
         <translation>Нажмите, чтобы полосы прокрутки отображались слева а не справа.</translation>
     </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation>Редакт. схему</translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation>Щелкните для выбора цвета для:</translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
         <translation>Пример</translation>
     </message>
     <message>
         <source>Normal Item</source>
         <translation>Обычный элемент</translation>
     </message>
     <message>
         <source>Disabled Item</source>
         <translation>Запрещенный элемент</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Меню</translation>
     </message>
     <message>
         <source>Normal Text</source>
         <translation>Обычный текст</translation>
     </message>
     <message>
         <source>Highlighted Text</source>
         <translation>Выделенный текст</translation>
     </message>
     <message>
         <source>Button</source>
         <translation>Кнопка</translation>
     </message>
     <message>
         <source>Check Box</source>
         <translation>Выбор</translation>
     </message>
     <message>
         <source>Sample window using the selected settings.</source>
         <translation>Пример окна с использованием выбранных установок.</translation>
     </message>
 </context>
 </TS>
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
@@ -1,625 +1,593 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation>Фильтр категорий</translation>
     </message>
     <message>
         <source>Select one or more groups</source>
         <translation>Выберите одну или более групп</translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation>Читаю конфигурацию...</translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;Да</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Отмена</translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
     <message>
         <source>Remove
 </source>
         <translation>Убрать
 </translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation>Установить
 </translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation>Обновить
 </translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation>(Переустановить)</translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation>(Обновить)</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation>Место назначения</translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation>Место доступно</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Вывод</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Начать</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Опции</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Все</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Текст</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation>Отменить</translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation>
 **** Пользователь нажал Отменить ***</translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation>**** Процесс отменен **** </translation>
     </message>
     <message>
         <source>Save output</source>
         <translation>Сохранить вывод</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Неизвестный</translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation>%1 кбайт</translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation>Опции</translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation>Игнор. зависимости</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation>Вынужд. переустановка</translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation>Вынужд. удаление</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation>Вынужд. перезапись</translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation>Уровень информации</translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation>Только ошибки</translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation>Обычные сообщения</translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation>Полезные сообщения</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation>Выявление неисправностей</translation>
     </message>
 </context>
 <context>
     <name>Ipkg</name>
     <message>
         <source>Dealing with package %1</source>
         <translation>Обрабатываю пакет %1</translation>
     </message>
     <message>
         <source>Removing symbolic links...
 </source>
         <translation>Убираю ссылки...
 </translation>
     </message>
     <message>
         <source>Creating symbolic links for %1.</source>
         <translation>Создаю ссылки для %1.</translation>
     </message>
     <message>
         <source>Creating symbolic links for %1</source>
         <translation>Создаю ссылки для %1</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>Закончил</translation>
     </message>
     <message>
         <source>Removing status entry...</source>
         <translation>Убираю заметку о статусе...</translation>
     </message>
     <message>
         <source>status file - </source>
         <translation>файл статуса - </translation>
     </message>
     <message>
         <source>package - </source>
         <translation>пакет - </translation>
     </message>
     <message>
         <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>
         <translation>Ссылки созданы.
 </translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation>AQPkg - Менеджер пакетов</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation>Введите текст для поиска здесь.</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation>Нажмите чтобы скрыть Quick Jump панель.</translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation>Обновить списки</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation>Нажмите чтобы обновить списки пакетов с серверов.</translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation>Обновить</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation>Нажмите чтобы обновить все установленные пакеты если есть более свежая версия.</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Скачать</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation>Нажмите чтобы скачать выделенные пакеты.</translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation>Применить изменения</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation>Нажмите чтобы установить, убрать или обновить выделенные пакеты.</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Действия</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation>Показать неустановленные пакеты</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation>Нажмите чтобы показать доступные, но не установленные пакеты.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation>Показать установленные пакеты</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation>Нажмите чтобы показать пакеты установленные на этом устройстве.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation>Показать обновленные пакеты</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation>Нажмите чтобы показать пакеты установленные на этом устройстве для которых имеется более свежая версия.</translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation>Фильтровать по разделу</translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation>Нажмите чтобы показать список пакетов в одной категории.</translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation>Уст. категорию для фильтра</translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation>Нажмите чтобы сменить категорию пакетов на используемый фильтр.</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Найти</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation>Нажмите чтобы найти текст в названиях пакетов.</translation>
     </message>
     <message>
         <source>Find next</source>
         <translation>Найти дальше</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation>Нажмите чтобы найти следующий пакет содержащий нужный вам текст в названии.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation>Quick Jump клавиатура</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation>Нажмите чтобы показать/скрыть клавиатуру разрешающую быстрое перемещение по списку.</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Вид</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Настроить</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation>Нажмите чтобы настроить это приложение.</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation>Нажмите чтобы скрыть панель поиска.</translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation>Сервера:</translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation>Нажмите чтобы выбрать источник пакетов.</translation>
     </message>
     <message>
         <source>Packages</source>
         <translation>Пакеты</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 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>Это список всех пакетов из выделенного выше источника.
 
 Синяя точка рядом с названием показывает что пакет установлен.
 
 Синяя точка со звездой показывает что более свежая версия доступна из источника.
 
 Нажмите внутри квадрата слева чтобы выделить пакет.</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Удалить</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation>Нажмите чтобы удалить выбранные пакеты.</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation>Выстраиваю список серверов:
 <byte value="x9"/>%1</translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation>Выстраиваю список серверов для:
 <byte value="x9"/>%1</translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
         <translation>Обновляю список пакетов с сервера</translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation>ВНИМАНИЕ: Обновлять пакеты
 когда запущен Opie/Qtopia
 не рекомендуется!
 
 Вы уверены?
 </translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Предупреждение</translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
         <translation>Обновляю установленные пакеты</translation>
     </message>
     <message>
         <source>Are you sure you wish to delete
 %1?</source>
         <translation>Вы уверены что хотите удалить
 %1?</translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation>Вы уверены?</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Нет</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Да</translation>
     </message>
     <message>
         <source>Download to where</source>
         <translation>Скачать куда</translation>
     </message>
     <message>
         <source>Enter path to download to</source>
         <translation>Введите путь куда надо скачать</translation>
     </message>
     <message>
         <source>Install Remote Package</source>
         <translation>Установить внешний пакет</translation>
     </message>
     <message>
         <source>Enter package location</source>
         <translation>Введите место где находится пакет</translation>
     </message>
     <message>
         <source>Nothing to do</source>
         <translation>Нечего делать</translation>
     </message>
     <message>
         <source>No packages selected</source>
         <translation>Не выделено ни одного пакета</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Да</translation>
     </message>
     <message>
         <source>Do you wish to remove or reinstall
 %1?</source>
         <translation>Вы хотите удалить или же переустановить
 %1?</translation>
     </message>
     <message>
         <source>Remove or ReInstall</source>
         <translation>Удалить или переустановить</translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation>Переустановить</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>Updating Launcher...</source>
         <translation>Обновляю Launcher...</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>
         <translation>&lt;p&gt;&lt;b&gt;Установлен в&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Размер&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Секция&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Имя файла&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Установленная версия&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Доступная версия&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>Package Information</source>
         <translation>Информация о пакете</translation>
     </message>
     <message>
         <source>Package information is unavailable</source>
         <translation>Информация о пакете недоступна</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Installed packages</source>
         <translation>Установленные пакеты</translation>
     </message>
     <message>
         <source>Local packages</source>
         <translation>Местные пакеты</translation>
     </message>
     <message>
         <source>N/A</source>
         <translation>N/A</translation>
     </message>
     <message>
         <source>Package - %1
               version - %2</source>
         <translation>Пакет - %1
              версия - %2</translation>
     </message>
     <message>
         <source>
               inst version - %1</source>
         <translation>
              устан. версия - %1</translation>
     </message>
     <message>
         <source>Version string is empty.</source>
         <translation>Строка версии пуста.</translation>
     </message>
     <message>
         <source>Epoch in version is not number.</source>
         <translation>Префикс версии не является числом.</translation>
     </message>
     <message>
         <source>Nothing after colon in version number.</source>
         <translation>В номере версии после двоеточия ничего нет.</translation>
     </message>
 </context>
 <context>
     <name>QuestionDlg</name>
     <message>
         <source>Remove</source>
         <translation>Убрать</translation>
     </message>
 </context>
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,188 +1,148 @@
 <!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>
     <message>
         <source>Backup Failed!</source>
         <translation>Архивация не удалась!</translation>
     </message>
     <message>
         <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>
         <source>Restore Backup...</source>
         <translation>Восстанавливаю...</translation>
     </message>
     <message>
         <source>&lt;qt&gt;%1&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;%1&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation>Восстановить</translation>
     </message>
     <message>
         <source>Would you really overwrite your local data?</source>
         <translation>Вы действительно хотите переписать локальные данные?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Да</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Нет</translation>
     </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <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>
         <source>&amp;OK</source>
         <translation>&amp;Да</translation>
     </message>
 </context>
 </TS>
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
@@ -1,190 +1,178 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BacDialog</name>
     <message>
         <source>Blood Alcohol Estimator</source>
         <translation>Оценщик уровня алкоголя в крови</translation>
     </message>
     <message>
         <source># Drinks Consumed</source>
         <translation>Число принятых порций</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation>Вес</translation>
     </message>
     <message>
         <source>Kilos</source>
         <translation>Килограммов</translation>
     </message>
     <message>
         <source>Pounds</source>
         <translation>Фунтов</translation>
     </message>
     <message>
         <source>Units</source>
         <translation>Система</translation>
     </message>
     <message>
         <source>Period of Time (hours)</source>
         <translation>Период времени (часов)</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Мужской</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Женский</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Неизвестно</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Пол</translation>
     </message>
     <message>
         <source>Beer</source>
         <translation>Пиво</translation>
     </message>
     <message>
         <source>Wine</source>
         <translation>Вино</translation>
     </message>
     <message>
         <source>Shot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type of drink</source>
         <translation>Тип напитка</translation>
     </message>
     <message>
         <source>Calculate</source>
         <translation>Вычислить</translation>
     </message>
 </context>
 <context>
     <name>Bartender</name>
     <message>
         <source>Bartender</source>
         <translation>Бармен</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Файл</translation>
     </message>
     <message>
         <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>
         <source>Name of Drink</source>
         <translation>Имя напитка</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Примечания</translation>
     </message>
     <message>
         <source>Drink database not opened sucessfully.
 </source>
         <translation>Не могу открыть базу данных напитков.
 </translation>
     </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>
     </message>
     <message>
         <source>Edit Drink</source>
         <translation>Правка напитка</translation>
     </message>
     <message>
         <source>Failed to write to drink database!
 </source>
         <translation>Не могу записать базу данных напитков!
 </translation>
     </message>
     <message>
         <source>Ingredient</source>
         <translation>Ингредиент</translation>
     </message>
 </context>
 <context>
     <name>New_Drink</name>
     <message>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
         <source>Ingredients</source>
         <translation>Ингредиенты</translation>
     </message>
 </context>
 <context>
     <name>Show_Drink</name>
     <message>
         <source>Edit</source>
         <translation>Правка</translation>
     </message>
 </context>
 </TS>
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,339 +1,331 @@
 <!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>
         <source>CE</source>
         <translation>CE</translation>
     </message>
     <message>
         <source>log</source>
         <translation>log</translation>
     </message>
     <message>
         <source>ln</source>
         <translation>ln</translation>
     </message>
     <message>
         <source>(</source>
         <translation>(</translation>
     </message>
     <message>
         <source>)</source>
         <translation>)</translation>
     </message>
     <message>
         <source>sin</source>
         <translation>sin</translation>
     </message>
     <message>
         <source>cos</source>
         <translation>cos</translation>
     </message>
     <message>
         <source>tan</source>
         <translation>tg</translation>
     </message>
     <message>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
         <source>+/-</source>
         <translation>+/-</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>=</source>
         <translation>=</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>.</source>
         <translation>.</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <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>
         <translation>Вес</translation>
     </message>
     <message>
         <source>Distance</source>
         <translation>Длина</translation>
     </message>
     <message>
         <source>Area</source>
         <translation>Площадь</translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation>Температура</translation>
     </message>
     <message>
         <source>Volume</source>
         <translation>Объем</translation>
     </message>
     <message>
         <source>acres</source>
         <translation>акры</translation>
     </message>
     <message>
         <source>&#xb0;C</source>
         <translation>°C</translation>
     </message>
     <message>
         <source>carats</source>
         <translation>караты</translation>
     </message>
     <message>
         <source>cm</source>
         <translation>см</translation>
     </message>
     <message>
         <source>cu cm</source>
         <translation>куб. см</translation>
     </message>
     <message>
         <source>cu ft</source>
         <translation>куб. футы</translation>
     </message>
     <message>
         <source>cu in</source>
         <translation>куб. дюймы</translation>
     </message>
     <message>
         <source>&#xb0;F</source>
         <translation>°F</translation>
     </message>
     <message>
         <source>fl oz (US)</source>
         <translation>жидк. унции</translation>
     </message>
     <message>
         <source>ft</source>
         <translation>футы</translation>
     </message>
     <message>
         <source>g</source>
         <translation>г</translation>
     </message>
     <message>
         <source>gal (US)</source>
         <translation>галлоны</translation>
     </message>
     <message>
         <source>hectares</source>
         <translation>гектары</translation>
     </message>
     <message>
         <source>in</source>
         <translation>дюймы</translation>
     </message>
     <message>
         <source>kg</source>
         <translation>кг</translation>
     </message>
     <message>
         <source>km</source>
         <translation>км</translation>
     </message>
     <message>
         <source>l</source>
         <translation>л</translation>
     </message>
     <message>
         <source>lb</source>
         <translation>фунты</translation>
     </message>
     <message>
         <source>Lg tons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>m</source>
         <translation>м</translation>
     </message>
     <message>
         <source>mg</source>
         <translation>мг</translation>
     </message>
     <message>
         <source>mi</source>
         <translation>мили</translation>
     </message>
     <message>
         <source>ml</source>
         <translation>мл</translation>
     </message>
     <message>
         <source>mm</source>
         <translation>мм</translation>
     </message>
     <message>
         <source>naut. mi</source>
         <translation>морские мили</translation>
     </message>
     <message>
         <source>oz</source>
         <translation>унции</translation>
     </message>
     <message>
         <source>points</source>
         <translation>пойнты</translation>
     </message>
     <message>
         <source>pt</source>
         <translation>пинты</translation>
     </message>
     <message>
         <source>qt</source>
         <translation>кварты</translation>
     </message>
     <message>
         <source>sq cm</source>
         <translation>кв. см</translation>
     </message>
     <message>
         <source>sq ft</source>
         <translation>кв. футы</translation>
     </message>
     <message>
         <source>sq in</source>
         <translation>кв. дюймы</translation>
     </message>
     <message>
         <source>sq km</source>
         <translation>кв. км</translation>
     </message>
     <message>
         <source>sq m</source>
         <translation>кв. м</translation>
     </message>
     <message>
         <source>sq mi</source>
         <translation>кв. мили</translation>
     </message>
     <message>
         <source>sq mm</source>
         <translation>кв. мм</translation>
     </message>
     <message>
         <source>sq yd</source>
         <translation>кв. ярды</translation>
     </message>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>St tons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tblspoon</source>
         <translation>стл. ложки</translation>
     </message>
     <message>
         <source>teaspoons</source>
         <translation>ч. ложки</translation>
     </message>
     <message>
         <source>tonnes</source>
         <translation>тонны</translation>
     </message>
     <message>
         <source>yd</source>
         <translation>ярды</translation>
     </message>
 </context>
 </TS>
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
@@ -1,288 +1,207 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AlarmDlg</name>
     <message>
         <source>Clock</source>
         <translation>Часы</translation>
     </message>
     <message>
         <source>Snooze</source>
         <translation>Вздремнуть</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
 </context>
 <context>
     <name>AlarmDlgBase</name>
     <message>
         <source>Form1</source>
         <translation>Форма1</translation>
     </message>
     <message>
         <source>TextLabel1</source>
         <translation>ТекстМетка1</translation>
     </message>
     <message>
         <source>Snooze</source>
         <translation>Вздремнуть</translation>
     </message>
     <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>
         <translation>Срд</translation>
     </message>
     <message>
         <source>Thu</source>
         <comment>Thursday</comment>
         <translation>Чтв</translation>
     </message>
     <message>
         <source>Fri</source>
         <comment>Friday</comment>
         <translation>Птн</translation>
     </message>
     <message>
         <source>Sat</source>
         <comment>Saturday</comment>
         <translation>Сбт</translation>
     </message>
     <message>
         <source>Sun</source>
         <comment>Sunday</comment>
         <translation>Вск</translation>
     </message>
     <message>
         <source>Lap/Split</source>
         <translation>Забег/разделить</translation>
     </message>
     <message>
         <source>&lt;b&gt;Daily Alarm:&lt;/b&gt;&lt;p&gt;</source>
         <translation>&lt;b&gt;Ежедневный будильник:&lt;/b&gt;&lt;p&gt;</translation>
     </message>
     <message>
         <source>Select Day</source>
         <translation>Выбрать день</translation>
     </message>
     <message>
         <source>Daily alarm requires at least
 one day to be selected.</source>
         <translation>Для ежедневного будильника
 требуется выбрать хотя бы один день.</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Все</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Аудио</translation>
     </message>
 </context>
 <context>
     <name>ClockBase</name>
     <message>
         <source>Clock</source>
         <translation>Часы</translation>
     </message>
     <message>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
         <source>Stopwatch</source>
         <translation>Секундомер</translation>
     </message>
     <message>
         <source>Split</source>
         <translation>Разделить</translation>
     </message>
     <message>
         <source>Lap</source>
         <translation>Забег</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Старт</translation>
     </message>
     <message>
         <source>Starts and stops the stopwatch.</source>
         <translation>Запускает и останавливает секундомер.</translation>
     </message>
     <message>
         <source>Lap/Split</source>
         <translation>Забег/разделить</translation>
     </message>
     <message>
         <source>Resets the stopwatch.</source>
         <translation>Сбрасывает секундомер.</translation>
     </message>
     <message>
         <source>Alarm</source>
         <translation>Будильник</translation>
     </message>
     <message>
         <source>Daily Alarm</source>
         <translation>Ежедневный будильник</translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation>Включен</translation>
     </message>
     <message>
         <source>Check to enable the daily alarm</source>
         <translation>Нажмите чтобы включить будильник</translation>
     </message>
     <message>
         <source>Set the hour the alarm will sound.</source>
         <translation>Установить часовую стрелку будильника.</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Set the minute the alarm will sound.</source>
         <translation>Установить минутную стрелку будильника.</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>Days:</source>
         <translation>Дни:</translation>
     </message>
     <message>
         <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
@@ -1,728 +1,736 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation>Календарь</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Новый</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>Сегодня</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>День</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Неделя</translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation>Список на неделю</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Месяц</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Найти</translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation>Событие длиннее, чем
 интервал между повторами.</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Не могу редактировать, синхронизируюсь</translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation>Редактировать</translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation>минут)</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Ок</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Нет места</translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation>Календарь не может записать
 Ваши изменения.
 Освободите место и попробуйте еще раз.
 
 Все равно выйти?</translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation>(Неизвестно)</translation>
     </message>
     <message>
         <source>Error!</source>
         <translation>Ошибка!</translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation>Исправить</translation>
     </message>
     <message>
         <source>Continue</source>
         <translation>Продолжить</translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation>Сдублировать событие</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>Редактировать...</translation>
     </message>
     <message>
         <source>error box</source>
         <translation>Ошибки</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation>Пн</translation>
     </message>
     <message>
         <source>T</source>
         <translation>Вт</translation>
     </message>
     <message>
         <source>W</source>
         <translation>Ср</translation>
     </message>
     <message>
         <source>F</source>
         <translation>Пт</translation>
     </message>
     <message>
         <source>S</source>
         <translation>Сб</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Пон</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Вт</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Ср</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Чт</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Пт</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Сб</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Вс</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00в</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation>С</translation>
     </message>
     <message>
         <source>End</source>
         <translation>По</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Редактировать</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Отправить</translation>
     </message>
     <message>
         <source>This is an all day event.</source>
         <translation>Это событие на весь день.</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Время</translation>
     </message>
     <message>
         <source> - </source>
         <translation>-</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Сдублировать</translation>
     </message>
     <message>
         <source>Beam this occurence</source>
         <translation>Отправить</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation>:00веч</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation>:00ут</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>Веч</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>Ут</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Календарь</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>Свойства</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation>Начало просмотра</translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation>С:</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation>Уст. сигнала</translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation>Сигнал</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>мин</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Смешанное</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>Строка:</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>По умолчанию</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Средняя</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Большая</translation>
     </message>
     <message>
         <source>Views</source>
         <translation>Просмотр</translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation>По умолчанию:</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>День</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Неделя</translation>
     </message>
     <message>
         <source>Week List</source>
         <translation>Список</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Месяц</translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation>На тек. время</translation>
     </message>
     <message>
         <source>Time display</source>
         <translation>Время</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ничего</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Начало</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation>С..до..</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>По умолчанию</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Место:</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Офис</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Дома</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Категория:</translation>
     </message>
+    <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>
         <translation>н</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Янв-00. Янв</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
         <translation>ПВСЧПСВП</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstEvent</name>
     <message>
         <source>Edit</source>
         <translation>Правка</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Сдублировать</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Отправить</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>н</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>Н: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Calendar</source>
         <translation>Календарь</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>Повтор...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>Ежедневно...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>Еженедельно...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>Ежемесячно...</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>Ежегодно...</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Нет повтора...</translation>
     </message>
     <message>
         <source>Start Time</source>
         <translation>Время начала</translation>
     </message>
     <message>
         <source>End Time</source>
         <translation>Время окончания</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>Новое событие</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Место</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Категория</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Встреча</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Ужин</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Обед</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Путешествие</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Офис</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Дом</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>Янв 02 00</translation>
     </message>
     <message>
         <source>Start time</source>
         <translation>Время начала</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Весь день</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Час. пояс</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Сигнал</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>минут</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Беззвучно</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Громко</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Повтор</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Нет повтора...</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Описание</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>С...по...</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Заметки...</translation>
     </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation>Информация</translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Редакт. заметки</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Обед</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Начало</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Оконч.</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Каждые</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 кажд.</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>%1 кажд.</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>%1 %1 кажд.</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Каждый</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Пон.</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Вт.</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Ср.</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Чтв.</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Пят.</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Сб.</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Вск.</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>й</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>й</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>й</translation>
     </message>
     <message>
         <source>th</source>
         <translation>й</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation>Нет повтора</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>день(дни)</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>неделя(и)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Повтор</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>День</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>мес.</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>год</translation>
     </message>
     <message>
         <source>days</source>
         <translation>дней</translation>
     </message>
     <message>
         <source>day</source>
         <translation>день</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>недель</translation>
     </message>
     <message>
         <source>week</source>
         <translation>нед.</translation>
     </message>
     <message>
         <source>month</source>
         <translation>мес.</translation>
     </message>
     <message>
         <source>year</source>
         <translation>год</translation>
     </message>
     <message>
         <source> and </source>
         <translation>и</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>, 
 и</translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, и</translation>
     </message>
     <message>
         <source>on </source>
         <translation>на</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Повторяющееся</translation>
     </message>
     <message>
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,41 +1,31 @@
 <!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>
         <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 annoying...)</source>
         <translation>&lt;b&gt;Вы хотите иметь вкладку Документы?&lt;/b&gt;&lt;p&gt;
 (Заметьте что для этого требуется сканировать
 &lt;i&gt;все&lt;/i&gt; документы на &lt;i&gt;всех&lt;/i&gt; внешних устройствах,
 что может быть очень медленно и надоедливо...)</translation>
     </message>
 </context>
 </TS>
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
@@ -1,293 +1,249 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation>Выбор команды</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">Мелкий 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>
         <source>Tab</source>
         <translation>Таб</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Вверх</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Вниз</translation>
     </message>
     <message>
         <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>
         <source>Cyan on White</source>
         <translation>Голубой на белом</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>Белый на голубом</translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation>Синий на черном</translation>
     </message>
     <message>
         <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>
         <source>ScrollBar</source>
         <translation>Полоса прокрутки</translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation>Показать список команд</translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation>Скрыть список команд</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation>Свой</translation>
     </message>
     <message>
         <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>
         <source>Hidden</source>
         <translation>Скрыть</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Вкладки</translation>
     </message>
     <message>
         <source>Black on Pink</source>
         <translation>Черный на розовом</translation>
     </message>
     <message>
         <source>Pink on Black</source>
         <translation>Розовый на черном</translation>
     </message>
     <message>
         <source>default</source>
         <translation>по умолчанию</translation>
     </message>
     <message>
         <source>new session</source>
         <translation>новый сеанс</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Вид</translation>
     </message>
     <message>
         <source>Fonts</source>
         <translation>Шрифты</translation>
     </message>
     <message>
         <source>Sessions</source>
         <translation>Сеансы</translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation>На весь экран</translation>
     </message>
     <message>
         <source>Zoom</source>
         <translation>Увеличить</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>Правка...</translation>
     </message>
     <message>
         <source>History...</source>
         <translation>История...</translation>
     </message>
     <message>
         <source>To exit fullscreen, tap here.</source>
         <translation>Чтобы выйти из полноэкранного режима, нажмите здесь.</translation>
     </message>
     <message>
         <source>History Lines:</source>
         <translation>Линий истории:</translation>
     </message>
     <message>
         <source>Konsole </source>
         <translation>Консоль</translation>
     </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Выбор команд</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation>Добавить команду</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation>Введите команду:</translation>
     </message>
 </context>
 </TS>
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
@@ -1,100 +1,96 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FifteenConfigDialog</name>
     <message>
         <source>All Images</source>
         <translation>Все изображения</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation>Все файлы</translation>
     </message>
     <message>
         <source>Select board background</source>
         <translation>Выберите фон доски</translation>
     </message>
 </context>
 <context>
     <name>FifteenConfigDialogBase</name>
     <message>
         <source>Configure Fifteen</source>
         <translation>Настроить Пятнадцать</translation>
     </message>
     <message>
         <source>Use a Custom Image</source>
         <translation>Задать свое изображение</translation>
     </message>
     <message>
         <source>Custom Image</source>
         <translation>Свое изображение</translation>
     </message>
     <message>
         <source>&lt;b&gt;Path:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Путь:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
         <source>&lt;b&gt;Preview:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Просмотр:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Grid</source>
         <translation>Сетка</translation>
     </message>
     <message>
         <source>&lt;b&gt;Rows:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Строки:&lt;/b&gt;</translation>
     </message>
     <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>
 <context>
     <name>PiecesTable</name>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Пятнашки</translation>
     </message>
     <message>
         <source>Congratulations!
 You win the game!</source>
         <translation>Поздравляю!
 Вы выиграли!</translation>
     </message>
     <message>
         <source>R&amp;andomize Pieces</source>
         <translation>&amp;Перемешать фишки</translation>
     </message>
     <message>
         <source>&amp;Reset Pieces</source>
         <translation>&amp;Сбросить фишки</translation>
     </message>
 </context>
 </TS>
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
@@ -1,56 +1,52 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GoMainWidget</name>
     <message>
         <source>New Game</source>
         <translation>Новая игра</translation>
     </message>
     <message>
         <source>Pass</source>
         <translation>Передать</translation>
     </message>
     <message>
         <source>Resign</source>
         <translation>Сдаться</translation>
     </message>
     <message>
         <source>Two player option</source>
         <translation>Два игрока</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Игра</translation>
     </message>
 </context>
 <context>
     <name>GoWidget</name>
     <message>
         <source>White %1, Black %2. </source>
         <translation>Белых %1, Черных %2. </translation>
     </message>
     <message>
         <source>White wins.</source>
         <translation>Белые выиграли.</translation>
     </message>
     <message>
         <source>Black wins.</source>
         <translation>Черные выиграли.</translation>
     </message>
     <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
@@ -1,464 +1,460 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Edit_Title</name>
     <message>
         <source>Edit Title</source>
         <translation>Правка названия</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
         <source>Apply</source>
         <translation>Применить</translation>
     </message>
 </context>
 <context>
     <name>FontDialog</name>
     <message>
         <source>Font Dialog</source>
         <translation>Диалог шрифтов</translation>
     </message>
     <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>
         <translation>Вы хотите скачать свежий библиотечный
 индекс Проекта Гутенберг?
 или выбрать FTP сайт?
 </translation>
     </message>
     <message>
         <source>&amp;Library Index</source>
         <translation>&amp;Библиотечный индекс</translation>
     </message>
     <message>
         <source>&amp;Ftp Site</source>
         <translation>&amp;FTP сайт</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Отмена</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Примечания</translation>
     </message>
     <message>
         <source>Etext Search</source>
         <translation>Поиск е-текста</translation>
     </message>
     <message>
         <source>Please install unzip</source>
         <translation>Пожалуйста установите unzip</translation>
     </message>
     <message>
         <source>Gutenberg Library</source>
         <translation>Библиотека Гутенберг</translation>
     </message>
     <message>
         <source>Gutenbrowser</source>
         <translation>Гутенбраузер</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Открыть</translation>
     </message>
     <message>
         <source>Search google.com</source>
         <translation>Искать на google.com</translation>
     </message>
     <message>
         <source>Edit Title</source>
         <translation>Правка названия</translation>
     </message>
     <message>
         <source>Please install unzip in your PATH</source>
         <translation>Пожалуйста установите unzip в вашем PATH</translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation>Скачиваю индекс Гутенберга...</translation>
     </message>
 </context>
 <context>
     <name>HelpMe</name>
     <message>
         <source>Based on gutenbook.pl, available from http://www.gutenbook.org</source>
         <translation>Основан на gutenbook.pl, доступен на http://www.gutenbook.org</translation>
     </message>
     <message>
         <source>Much appreciation to Lee Burgess,</source>
         <translation>Выражаем признательность Lee Burgess</translation>
     </message>
     <message>
         <source>for the original idea and concept of gutenbook.
 </source>
         <translation>за оригинальную идею и принцип гутенкниги.
 </translation>
     </message>
     <message>
         <source>A list of current Gutenberg ftp sites is at http://promo.net/pg/index.html
 </source>
         <translation>Список текущих Гутенберг сайтов находится на http://promo.net/pg/index.html
 </translation>
     </message>
     <message>
         <source>For bug reports, comments or questions about Gutenbrowser, email</source>
         <translation>Отсылайте отчеты об ошибках, комментарии и вопросы о Гутенбраузере по адресу</translation>
     </message>
     <message>
         <source>ljp@llornkcor.com
 </source>
         <translation>ljp@llornkcor.com</translation>
     </message>
     <message>
         <source>
 Made using Qt, Qt Embedded, and Qtopia, a cross platform development API
 http://www.trolltech.com
 
 </source>
         <translation>
 Написано с использованием Qt, Qt Embedded, и Qtopia, кросс-платформенного API
 http://www.trolltech.com
 
 </translation>
     </message>
     <message>
         <source>Arnold&apos;s Laws of Documentation:</source>
         <translation>Законы документации Арнольда:</translation>
     </message>
     <message>
         <source>(1) If it should exist, it doesn&apos;t.</source>
         <translation>(1) Если она должна существовать, то ее нет.</translation>
     </message>
     <message>
         <source>(2) If it does exist, it&apos;s out of date.</source>
         <translation>(2) Если она существует, она уже устарела.</translation>
     </message>
     <message>
         <source>(3) Only documentation for</source>
         <translation>(3) Только документация для</translation>
     </message>
     <message>
         <source>useless programs transcends the</source>
         <translation>бесполезных программ избегает</translation>
     </message>
     <message>
         <source>first two laws.
 </source>
         <translation>влияния первых двух законов.
 </translation>
     </message>
     <message>
         <source>Everything is temporary, anyway....
  :o)</source>
         <translation>В конце концов, ничто не вечно...
 :o)</translation>
     </message>
 </context>
 <context>
     <name>HelpWindow</name>
     <message>
         <source>&amp;Open File</source>
         <translation>&amp;Открыть файл</translation>
     </message>
     <message>
         <source>&amp;Close</source>
         <translation>&amp;Закрыть</translation>
     </message>
     <message>
         <source>&amp;Backward</source>
         <translation>&amp;Назад</translation>
     </message>
     <message>
         <source>&amp;Forward</source>
         <translation>&amp;Вперед</translation>
     </message>
     <message>
         <source>&amp;Home</source>
         <translation>&amp;Домой</translation>
     </message>
     <message>
         <source>Add Bookmark</source>
         <translation>Добавить закладку</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Файл</translation>
     </message>
     <message>
         <source>&amp;Go</source>
         <translation>&amp;Перейти</translation>
     </message>
     <message>
         <source>History</source>
         <translation>История</translation>
     </message>
     <message>
         <source>Bookmarks</source>
         <translation>Закладки</translation>
     </message>
     <message>
         <source>Backward</source>
         <translation>Назад</translation>
     </message>
     <message>
         <source>Forward</source>
         <translation>Вперед</translation>
     </message>
     <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>
         <source>Title</source>
         <translation>Название</translation>
     </message>
     <message>
         <source>Author</source>
         <translation>Автор</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Год</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Файл</translation>
     </message>
     <message>
         <source>A-F</source>
         <translation>A-F</translation>
     </message>
     <message>
         <source>G-M</source>
         <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>
         <translation>Сначала фамилия 
 (необходим перезапуск библиотеки)</translation>
     </message>
     <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>
         <source>&amp;Cancel</source>
         <translation>&amp;Отмена</translation>
     </message>
 </context>
 <context>
     <name>OpenEtext</name>
     <message>
         <source>All</source>
         <translation>Все</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Текст</translation>
     </message>
     <message>
         <source>Remove Etext</source>
         <translation>Удалить е-текст</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Да</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Отмена</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Sea&amp;rch</source>
         <translation>&amp;Найти</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Отмена</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Учет регистра</translation>
     </message>
 </context>
 <context>
     <name>SearchResultsDlg</name>
     <message>
         <source>Search Results</source>
         <translation>Результаты поиска</translation>
     </message>
     <message>
         <source>&amp;Download</source>
         <translation>&amp;Скачать</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Отмена</translation>
     </message>
 </context>
 <context>
     <name>optionsDialog</name>
     <message>
         <source>Opera</source>
         <translation>Opera</translation>
     </message>
     <message>
         <source>Konqueror</source>
         <translation>Konqueror</translation>
     </message>
     <message>
         <source>wget</source>
         <translation>wget</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Все</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Текст</translation>
     </message>
     <message>
         <source>Downloading ftp sites....</source>
         <translation>Скачиваю список FTP сайтов...</translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation>Запускаю wget</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Примечания</translation>
     </message>
     <message>
         <source>ftpSiteDlg</source>
         <translation>фтпСайтДлг</translation>
     </message>
     <message>
         <source>List File not opened sucessfully.</source>
         <translation>Не могу открыть файл списка.</translation>
     </message>
     <message>
         <source>File not opened sucessfully.</source>
         <translation>Не смог открыть файл.</translation>
     </message>
     <message>
         <source>Main</source>
         <translation>Главные</translation>
     </message>
     <message>
         <source>FTP</source>
         <translation>FTP</translation>
     </message>
     <message>
         <source>http://sailor.gutenberg.org</source>
         <translation>http://sailor.gutenberg.org</translation>
     </message>
     <message>
         <source>http://www.prairienet.org/pg</source>
         <translation>http://www.prairienet.org/pg</translation>
     </message>
     <message>
         <source>HTTP</source>
         <translation>HTTP</translation>
     </message>
     <message>
         <source>Gutenbrowser Options</source>
         <translation>Настройки Гутенбраузера</translation>
     </message>
 </context>
 </TS>
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
@@ -1,68 +1,64 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KBill</name>
     <message>
         <source>kBill</source>
         <translation>кБилл</translation>
     </message>
     <message>
         <source>New game</source>
         <translation>Новая игра</translation>
     </message>
     <message>
         <source>Pause game</source>
         <translation>Пауза</translation>
     </message>
     <message>
         <source>Story of kBill</source>
         <translation>История кБилла</translation>
     </message>
     <message>
         <source>Rules</source>
         <translation>Правила</translation>
     </message>
     <message>
         <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>
         <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 disguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</source>
         <translation>&lt;b&gt;История&lt;/b&gt;&lt;p&gt;И снова судьба мира в ваших руках!  Злобный кракер, известный только по его кличке &apos;Билл&apos;, создал идеальный компьютерный вирус.  Вирус, который может запросто превратить обычный компьютер в тостер.  (ооо!) &apos;Билл&apos; склонировал себя в миллион-зиллион микро-Биллов.  Их единственная цель - занести этот мерзкий вирус, который был искусно замаскирован под популярную операционную системы. Ваша задача как Системного Администратора и Истребителя - предотвратить успешное завершение черного дела Билла.</translation>
     </message>
 </context>
 <context>
     <name>UI</name>
     <message>
         <source>After Level</source>
         <translation>После уровня</translation>
     </message>
     <message>
         <source>Your score</source>
         <translation>Ваши очки</translation>
     </message>
 </context>
 </TS>
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
@@ -1,296 +1,292 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KRFBConnection</name>
     <message>
         <source>Connected</source>
         <translation>Подключен</translation>
     </message>
     <message>
         <source>Connection Refused</source>
         <translation>Соединение отвергнуто</translation>
     </message>
     <message>
         <source>Host not found</source>
         <translation>Хост не найден</translation>
     </message>
     <message>
         <source>Read Error: QSocket reported an error reading
 data, the remote host has probably dropped the
 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>
         <source>Protocol Error: An unknown encoding was used by the server %1</source>
         <translation>Ошибка протокола: Сервер %1 использует неизвестную кодировку</translation>
     </message>
     <message>
         <source>Waiting for server initialization...</source>
         <translation>Ожидаю инициализации сервера...</translation>
     </message>
 </context>
 <context>
     <name>KRFBLogin</name>
     <message>
         <source>Waiting for server version...</source>
         <translation>Ожидаю версию сервера...</translation>
     </message>
     <message>
         <source>Error: Invalid server version, %1</source>
         <translation>Ошибка: Неверная версия сервера, %1</translation>
     </message>
     <message>
         <source>Error: Unsupported server version, %1</source>
         <translation>Ошибка: Версия сервера, %1, не поддерживается</translation>
     </message>
     <message>
         <source>Logged in</source>
         <translation>Вошел</translation>
     </message>
     <message>
         <source>Error: This server requires a password, but none has been specified.
 </source>
         <translation>Ошибка: На этом сервере требуется пароль, но он не был указан.
 </translation>
     </message>
     <message>
         <source>Error: The password you specified was incorrect.</source>
         <translation>Ошибка: Введенный вами пароль неверен.</translation>
     </message>
     <message>
         <source>Error: Too many invalid login attempts have been made
 to this account, please try later.</source>
         <translation>Ошибка: Было совершено слишком много попыток
 регистрации на этот учетный счет, попробуйте снова попозже.</translation>
     </message>
     <message>
         <source>Login Failed</source>
         <translation>Регистрация неудалась</translation>
     </message>
     <message>
         <source>Too many failures</source>
         <translation>Слишком много неудач</translation>
     </message>
 </context>
 <context>
     <name>KVNC</name>
     <message>
         <source>VNC Viewer</source>
         <translation>Клиент VNC</translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation>На весь экран</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>Отключиться</translation>
     </message>
     <message>
         <source>Stop Full Screen</source>
         <translation>Исходный размер окна</translation>
     </message>
     <message>
         <source>Connected to remote host</source>
         <translation>Подключен к удаленному хосту</translation>
     </message>
     <message>
         <source>Logged in to remote host</source>
         <translation>Вошел на удаленный хост</translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation>Соединение прервано</translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation>Новое соединение</translation>
     </message>
     <message>
         <source>Open Bookmark</source>
         <translation>Открыть закладку</translation>
     </message>
     <message>
         <source>Delete Bookmark</source>
         <translation>Удалить закладку</translation>
     </message>
     <message>
         <source>Send Contrl-Alt-Delete</source>
         <translation>Послать Ctrl-Alt-Del</translation>
     </message>
     <message>
         <source>Next Click is Double Click</source>
         <translation>Следующий щелчок - двойной</translation>
     </message>
     <message>
         <source>Next Click is Right Click</source>
         <translation>Следующий щелчок - правая кнопка</translation>
     </message>
 </context>
 <context>
     <name>KVNCBookmarkDlgBase</name>
     <message>
         <source>Bookmarks</source>
         <translation>Закладки</translation>
     </message>
     <message>
         <source>Choose a bookmark that you would like to open</source>
         <translation>Выберите закладку которую вы хотите открыть</translation>
     </message>
 </context>
 <context>
     <name>KVNCConnDlgBase</name>
     <message>
         <source>VNC Viewer Connection</source>
         <translation>Соединение клиента VNC</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Сервер</translation>
     </message>
     <message>
         <source>Show Password</source>
         <translation>Показать пароль</translation>
     </message>
     <message>
         <source>Password:</source>
         <translation>Пароль:</translation>
     </message>
     <message>
         <source>Bookmark Name:</source>
         <translation>Название закладки:</translation>
     </message>
     <message>
         <source>Host Name:</source>
         <translation>Имя хоста:</translation>
     </message>
     <message>
         <source>Display Number:</source>
         <translation>Номер дисплея:</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Опции</translation>
     </message>
     <message>
         <source>Check for screen updates every:</source>
         <translation>Обновлять экран каждые:</translation>
     </message>
     <message>
         <source>Milliseconds</source>
         <translation>Миллисекунд</translation>
     </message>
     <message>
         <source>Request 8-bit session</source>
         <translation>Запрашивать 8-битный сеанс</translation>
     </message>
     <message>
         <source>Raise on bell</source>
         <translation>Поднимать по сигналу</translation>
     </message>
     <message>
         <source>Request shared session</source>
         <translation>Запрашивать совместный сеанс</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>Scale Factor</source>
         <translation>Масштаб</translation>
     </message>
     <message>
         <source>Encodings</source>
         <translation>Кодировки</translation>
     </message>
     <message>
         <source>Hextile encoding</source>
         <translation>Hextile кодировка</translation>
     </message>
     <message>
         <source>CoRRE encoding</source>
         <translation>CoRRE кодировка</translation>
     </message>
     <message>
         <source>RRE encoding</source>
         <translation>RRE кодировка</translation>
     </message>
     <message>
         <source>Copy rectangle encoding</source>
         <translation>Copy rectangle кодировка</translation>
     </message>
     <message>
         <source>The password of the VNC server</source>
         <translation>Пароль VNC сервера</translation>
     </message>
     <message>
         <source>Toggle obscuring the password</source>
         <translation>Включить скрытие пароля</translation>
     </message>
     <message>
         <source>The name of the VNC server</source>
         <translation>Имя VNC сервера</translation>
     </message>
     <message>
         <source>The host name of the VNC server</source>
         <translation>Имя хоста VNC сервера</translation>
     </message>
     <message>
         <source>The display number of the VNC server</source>
         <translation>Номер дисплея VNC сервера</translation>
     </message>
     <message>
         <source>Delay between requesting updates from the server</source>
         <translation>Промежуток между запросами на обновление с сервера</translation>
     </message>
     <message>
         <source>Request that the VNC server transfer 8 bit color</source>
         <translation>Запросить 8 битный цвет с VNC сервера</translation>
     </message>
     <message>
         <source>Allow other users to connect to the VNC server</source>
         <translation>Позволить другим пользователям подключиться к VNC серверу</translation>
     </message>
     <message>
         <source>Scale the remote display to fit on the PDA (Slow)</source>
         <translation>Масштабировать удаленный дисплей чтобы вместить его на КПК (медленно)</translation>
     </message>
     <message>
         <source>Enable transmiting identical rectangles as references to existing data</source>
         <translation>Разрешить передачу одинаковых прямоугольников как ссылки на существующие данные</translation>
     </message>
 </context>
 </TS>
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
@@ -1,246 +1,250 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Keys</name>
     <message>
         <source>Ok</source>
         <translation>Да</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>По умолчанию</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
         <source>Change Direction Keys</source>
         <translation>Изменить клавиши направления</translation>
     </message>
     <message>
         <source>Undefined key</source>
         <translation>Незаданная клавиша</translation>
     </message>
 </context>
 <context>
     <name>Kpacman</name>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Новая</translation>
     </message>
     <message>
         <source>&amp;Pause</source>
         <translation>&amp;Пауза</translation>
     </message>
     <message>
         <source>&amp;Hall of fame</source>
         <translation>&amp;Доска почета</translation>
     </message>
     <message>
         <source>&amp;Quit</source>
         <translation>&amp;Выйти</translation>
     </message>
     <message>
         <source>&amp;Hide Mousecursor</source>
         <translation>&amp;Скрыть курсор мыши</translation>
     </message>
     <message>
         <source>&amp;Select graphic scheme</source>
         <translation>&amp;Выбрать тему графики</translation>
     </message>
     <message>
         <source>&amp;Pause in Background</source>
         <translation>&amp;Приостановить</translation>
     </message>
     <message>
         <source>&amp;Continue in Foreground</source>
         <translation>П&amp;родолжить</translation>
     </message>
     <message>
         <source>Change &amp;keys...</source>
         <translation>Изменить &amp;клавиши...</translation>
     </message>
     <message>
         <source>@PACKAGE@ - @VERSION@
 
 Joerg Thoennissen (joe@dsite.de)
 
 A pacman game for the KDE Desktop
 
 The program based on the source of ksnake
 by Michel Filippi (mfilippi@sade.rhein-main.de).
 The design was strongly influenced by the pacman
 (c) 1980 MIDWAY MFG.CO.
 
 I like to thank my girlfriend Elke Krueers for
 the last 10 years of her friendship.
 </source>
         <translation>@PACKAGE@ - @VERSION@
 
 Joerg Thoennissen (joe@dsite.de)
 
 Игра Packman для KDE
 
 Эта программа основана на исходниках ksnake,
 созданной Michel Filippi (mfilippi@sade.rhein-main.de).
 Pacman (c) 1980 MIDWAY MFG.CO очень сильно
 повлиял на этот дизайн.
 
 Я хочу поблагодарить мою подругу Elke Krueers
 за последнии 10 лет дружбы.
 </translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Справка</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>Не могу создать битшрифт.
 
 Файл &apos;@FONTNAME@&apos; не существует или
 имеет неизвестный формат.</translation>
     </message>
 </context>
 <context>
     <name>Referee</name>
     <message>
         <source>GAME  OVER</source>
         <translation>ИГРА  ОКОНЧЕНА</translation>
     </message>
     <message>
         <source>PLAYER ONE</source>
         <translation>ИГРОК НОМЕР ОДИН</translation>
     </message>
     <message>
         <source>READY!</source>
         <translation>ГОТОВ!</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>ПАУЗА</translation>
     </message>
     <message>
         <source>CHARACTER</source>
         <translation>ПЕРСОНАЖ</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>NICKNAME</source>
         <translation>КЛИЧКА</translation>
     </message>
     <message>
         <source>-SHADOW</source>
         <translation>-ТЕНЬ</translation>
     </message>
     <message>
         <source>&quot;BLINKY&quot;</source>
         <translation>&quot;МЕРЦАЮЩИЙ&quot;</translation>
     </message>
     <message>
         <source>-SPEEDY</source>
         <translation>-СКОРОСТНОЙ</translation>
     </message>
     <message>
         <source>&quot;PINKY&quot;</source>
         <translation>&quot;РОЗОВАТЫЙ&quot;</translation>
     </message>
     <message>
         <source>-BASHFUL</source>
         <translation>-СКРОМНЫЙ</translation>
     </message>
     <message>
         <source>&quot;INKY&quot;</source>
         <translation>&quot;ЧЕРНИЛЬНЫЙ&quot;</translation>
     </message>
     <message>
         <source>-POKEY</source>
         <translation>-КОЛЮЧИЙ</translation>
     </message>
     <message>
         <source>&quot;CLYDE&quot;</source>
         <translation>&quot;КЛАЙД&quot;</translation>
     </message>
     <message>
         <source>QTOPIA PORT: CATALIN CLIMOV</source>
         <translation>QTOPIA ПОРТ: КАТАЛИН КЛИМОВ</translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
         <translation>НАЖМИТЕ НА КУРСОР ЧТОБЫ НАЧАТЬ</translation>
     </message>
 </context>
 <context>
     <name>Score</name>
     <message>
         <source>  1UP </source>
         <translation>  1UP</translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
         <translation>РЕКОРД</translation>
     </message>
     <message>
         <source>  2UP </source>
         <translation>  2UP</translation>
     </message>
     <message>
         <source>     CONGRATULATIONS      </source>
         <translation>     ПОЗДРАВЛЯЕМ     </translation>
     </message>
     <message>
         <source>    YOU HAVE ARCHIEVED    </source>
         <translation>    ВЫ ДОСТИГЛИ    </translation>
     </message>
     <message>
         <source>  A SCORE IN THE TOP 10.  </source>
         <translation>  КОЛ-ВО ОЧКОВ В ТОП 10.  </translation>
     </message>
     <message>
         <source>RNK   SCORE  NAME   DATE</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; не существует или
 имеет неизвестный формат.</translation>
     </message>
     <message>
         <source>Initialization Error</source>
         <translation>Ошибка инициализации</translation>
     </message>
 </context>
 </TS>
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
@@ -1,290 +1,278 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DocTabSettings</name>
     <message>
         <source>Enable the Documents Tab</source>
         <translation>Разрешить вкладку Документы</translation>
     </message>
     <message>
         <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
         <translation>&lt;b&gt;Заметьте:&lt;/b&gt; Для того, чтобы эти изменения вступили в силу, может потребоваться перезапустить Opie.</translation>
     </message>
     <message>
         <source>Check, if you want the Documents Tab to be visible.</source>
         <translation>Установите, если хотите чтобы была видна вкладка Документы.</translation>
     </message>
 </context>
 <context>
     <name>InputMethodSettings</name>
     <message>
         <source>Resize application on Popup</source>
         <translation>Изменить размер при появлении</translation>
     </message>
     <message>
         <source>Enable floating and resizing</source>
         <translation>Разрешить изменение размера и положения</translation>
     </message>
     <message>
         <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
         <translation>&lt;b&gt;Заметьте:&lt;/b&gt; Для того, чтобы эти изменения вступили в силу, может потребоваться перезапустить Opie.</translation>
     </message>
     <message>
         <source>Check, if you want the application to be automatically resized if the input method pops up.</source>
         <translation>Отметьте если вы хотите чтобы размер окна был автоматически изменен при появлении метода ввода.</translation>
     </message>
     <message>
         <source>Check, if you want to move and/or resize input methods</source>
         <translation>Отметьте если вы хотите перемещать и/или изменять размер методов ввода</translation>
     </message>
     <message>
         <source>Specify the percentage of the screen width for the input method</source>
         <translation>Установите процент ширины экрана, отводимый для методов ввода</translation>
     </message>
 </context>
 <context>
     <name>LauncherSettings</name>
     <message>
         <source>Launcher Settings</source>
         <translation>Настройка запуска</translation>
     </message>
     <message>
         <source>Taskbar</source>
         <translation>Панель задач</translation>
     </message>
     <message>
         <source>O-Menu</source>
         <translation>О-Меню</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Вкладки</translation>
     </message>
     <message>
         <source>InputMethods</source>
         <translation>Методы ввода</translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation>ДокВкладка</translation>
     </message>
 </context>
 <context>
     <name>MenuSettings</name>
     <message>
         <source>Load applets in O-Menu:</source>
         <translation>Загрузить апплеты в О-Меню</translation>
     </message>
     <message>
         <source>Show Launcher tabs in O-Menu</source>
         <translation>Показать вкладки запуска в О-Меню</translation>
     </message>
     <message>
         <source>Check the applets that you want to have included in the O-Menu.</source>
         <translation>Выберите апплеты, которые вы хотите включить в О-Меню.</translation>
     </message>
     <message>
         <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
         <translation>Добавляет содержимое вкладки Запуска в О-Меню.</translation>
     </message>
     <message>
-        <source>Show Applications in subpopups</source>
-        <translation type="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>
         <translation>Пример 2</translation>
     </message>
     <message>
         <source>Sample 3</source>
         <translation>Пример 3</translation>
     </message>
 </context>
 <context>
     <name>TabDialog</name>
     <message>
         <source>Edit Tab</source>
         <translation>Правка вкладки</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>Фон</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Шрифт</translation>
     </message>
     <message>
         <source>Icons</source>
         <translation>Иконки</translation>
     </message>
     <message>
         <source>Previewing %1</source>
         <translation>Предв. просмотр %1</translation>
     </message>
     <message>
         <source>This is a rough preview of what the currently selected Tab will look like.</source>
         <translation>Грубый просмотр, на что похожа выбранная вкладка.</translation>
     </message>
     <message>
         <source>Use a custom font</source>
         <translation>Другой шрифт</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Тип:</translation>
     </message>
     <message>
         <source>Ruled</source>
         <translation>Было определено</translation>
     </message>
     <message>
         <source>Solid color</source>
         <translation>Заливка</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Картинка</translation>
     </message>
     <message>
         <source>Select...</source>
         <translation>Выбор...</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>По умолчанию</translation>
     </message>
     <message>
         <source>Size:</source>
         <translation>Размер:</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Маленький</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Большой</translation>
     </message>
     <message>
         <source>Color:</source>
         <translation>Цвет:</translation>
     </message>
     <message>
         <source>Columns:</source>
         <translation>Колонки:</translation>
     </message>
     <message>
         <source>Automatic</source>
         <translation>Авто</translation>
     </message>
 </context>
 <context>
     <name>TabsSettings</name>
     <message>
         <source>Launcher Tabs:</source>
         <translation>Вкладки Запуска:</translation>
     </message>
     <message>
         <source>foobar</source>
         <translation>нечто</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Добавить</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Правка</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
         <source>Enable big busy indicator</source>
         <translation>Большой индикатор занятости</translation>
     </message>
     <message>
-        <source>Enable blinking busy indicator</source>
-        <translation 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>
         <source>Not implemented yet</source>
         <translation>Пока не сделано</translation>
     </message>
     <message>
         <source>Enable animated busy indicator</source>
         <translation>Разрешить анимацию индикатора загрузки</translation>
     </message>
     <message>
         <source>Activate this, if you want an animatedbusy indicator for starting applications in the Launcher.</source>
         <translation>Включите если вы хотите анимированный индикатор загрузки приложений.</translation>
     </message>
     <message>
         <source>Enable static background pixmap</source>
         <translation>Включить статический фоновый рисунок</translation>
     </message>
     <message>
         <source>Activate this, if you want the background pixmap not to scroll with the icons.</source>
         <translation>Включите, если вы хотите, чтобы фон не перемещался вместе с иконками при прокрутке.</translation>
     </message>
 </context>
 <context>
     <name>TaskbarSettings</name>
     <message>
         <source>Load applets in Taskbar:</source>
         <translation>Загрузить апплеты в панель задач:</translation>
     </message>
     <message>
         <source>Check the applets that you want displayed in the Taskbar.</source>
         <translation>Выберите апплеты, которые должны быть в Панели Задач.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ru/libaboutapplet.ts b/i18n/ru/libaboutapplet.ts
index 5860e5b..42cb323 100644
--- a/i18n/ru/libaboutapplet.ts
+++ b/i18n/ru/libaboutapplet.ts
@@ -1,276 +1,98 @@
 <!DOCTYPE TS><TS>
 <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>
         <source>Join</source>
         <translation>Присоединяйтесь</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>&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.2&lt;/b&gt;&lt;/center&gt;</source>
         <translation>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.2&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;Alberto &apos;Skyhusker&apos; Garcia Hierro&lt;/b&gt; (skyhusker@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>&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;Alberto &apos;Skyhusker&apos; Garcia Hierro&lt;/b&gt; (skyhusker@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>
 </TS>
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,115 +1,87 @@
 <!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>
         <source>Very Low</source>
         <translation>Очень низкий</translation>
     </message>
     <message>
         <source>Critical</source>
         <translation>Критический</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Неизвестный</translation>
     </message>
     <message>
         <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>
         <source>Remaing Power: %1 %2
 Remaining Time: %3</source>
         <translation>Осталось заряда: %1 %2
 Осталось времени: %3</translation>
     </message>
     <message>
         <source>Ipaq  %1</source>
         <translation>Ipaq  %1</translation>
     </message>
 </context>
 </TS>
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
@@ -1,171 +1,167 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CableEdit</name>
     <message>
         <source>Device filename needed</source>
         <translation>Необходимо имя файла устройства</translation>
     </message>
 </context>
 <context>
     <name>CableGUI</name>
     <message>
         <source>Cable</source>
         <translation>Кабель</translation>
     </message>
     <message>
         <source>Lock file</source>
         <translation>Lock-файл</translation>
     </message>
     <message>
         <source>Device</source>
         <translation>Устройство</translation>
     </message>
     <message>
         <source>Serial settings</source>
         <translation>Настройки связи</translation>
     </message>
     <message>
         <source>2400</source>
         <translation>2400</translation>
     </message>
     <message>
         <source>9600</source>
         <translation>9600</translation>
     </message>
     <message>
         <source>19200</source>
         <translation>19200</translation>
     </message>
     <message>
         <source>38400</source>
         <translation>38400</translation>
     </message>
     <message>
         <source>57600</source>
         <translation>57600</translation>
     </message>
     <message>
         <source>115200</source>
         <translation>115200</translation>
     </message>
     <message>
         <source>230400</source>
         <translation>230400</translation>
     </message>
     <message>
         <source>460800</source>
         <translation>460800</translation>
     </message>
     <message>
         <source>500000</source>
         <translation>500000</translation>
     </message>
     <message>
         <source>921600</source>
         <translation>921600</translation>
     </message>
     <message>
         <source>1000000</source>
         <translation>1000000</translation>
     </message>
     <message>
         <source>1152000</source>
         <translation>1152000</translation>
     </message>
     <message>
         <source>1500000</source>
         <translation>1500000</translation>
     </message>
     <message>
         <source>2000000</source>
         <translation>2000000</translation>
     </message>
     <message>
         <source>2500000</source>
         <translation>2500000</translation>
     </message>
     <message>
         <source>3000000</source>
         <translation>3000000</translation>
     </message>
     <message>
         <source>3500000</source>
         <translation>3500000</translation>
     </message>
     <message>
         <source>4000000</source>
         <translation>4000000</translation>
     </message>
     <message>
         <source>Parity</source>
         <translation>Четность</translation>
     </message>
     <message>
         <source>Data bits</source>
         <translation>Биты данных</translation>
     </message>
     <message>
         <source>Speed</source>
         <translation>Скорость</translation>
     </message>
     <message>
         <source>Stop bits</source>
         <translation>Стоп-биты</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Нет</translation>
     </message>
     <message>
         <source>Even</source>
         <translation>Четные</translation>
     </message>
     <message>
         <source>Odd</source>
         <translation>Нечетные</translation>
     </message>
     <message>
         <source>Mark</source>
         <translation>Метка</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Пробел</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Flow control :</source>
         <translation>Контроль потока:</translation>
     </message>
     <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
@@ -1,170 +1,166 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Загрузка ЦП приложениами (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>Загрузка ЦП системой (%)</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Эта страница показывает загрузку центрального процессора на этом устройстве.</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Тип:</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your 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>Эта страница показывает сколько памяти (ОЗУ) распределено на вашем устройстве.
 Показаны следующие категории:
 
 1. Используется - память используемая Opie и прочими запущенными приложениями.
 2. Буфера - память, временно отведенная под хранение данных для ускорения доступа
 3. Кэш - информация, которая была недавно использована, но еще не освобождена.
 4. Свободно - память которая пока никем не используется.</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Всего памяти: %1 кбайт</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Использовано (%1 кбайт)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Буфера (%1 кбайт)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Кэш (%1 кбайт)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Свободно (%1 кбайт)</translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation>Всего подкачки: %1 кбайт</translation>
     </message>
 </context>
 <context>
     <name>MemoryStatus</name>
     <message>
         <source>Memory Status</source>
         <translation>Статус памяти</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Память</translation>
     </message>
     <message>
         <source>Swapfile</source>
         <translation>Файл подкачки</translation>
     </message>
     <message>
         <source>&lt;center&gt;&lt;b&gt;Memory Monitor Plugin&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Based on source code from:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;This program is licensed under GNU GPL.&lt;/center&gt;</source>
         <translation>&lt;center&gt;&lt;b&gt;Плагин монитора памяти&lt;/b&gt;&lt;br&gt;Копирайт (C) 2003 Антон Масловский&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Основано на исходных текстах:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;Эта программа распространяется на условиях GNU GPL.&lt;/center&gt;</translation>
     </message>
     <message>
         <source>About</source>
         <translation>О программе</translation>
     </message>
 </context>
 <context>
     <name>Swapfile</name>
     <message>
         <source>Swapfile location</source>
         <translation>Расположение файла подкачки</translation>
     </message>
     <message>
         <source>RAM</source>
         <translation>ОЗУ</translation>
     </message>
     <message>
         <source>CF Card</source>
         <translation>CF карта</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>SD карта</translation>
     </message>
     <message>
         <source> On </source>
         <translation>Вкл.</translation>
     </message>
     <message>
         <source> Off </source>
         <translation>Выкл.</translation>
     </message>
     <message>
         <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>
         <source>Failed to initialize swapfile.</source>
         <translation>Не могу инициализировать файл подкачки.</translation>
     </message>
     <message>
         <source>Swapfile created.</source>
         <translation>Файл подкачки создан.</translation>
     </message>
     <message>
         <source>Failed to remove swapfile.</source>
         <translation>Не могу удалить файл подкачки.</translation>
     </message>
     <message>
         <source>Swapfile removed.</source>
         <translation>Файл подкачки удален.</translation>
     </message>
     <message>
         <source>Swapfile activated.</source>
         <translation>Файл подкачки подключен.</translation>
     </message>
     <message>
         <source></source>
         <translation></translation>
     </message>
     <message>
         <source>2 Mb,4 Mb,6 Mb,8 Mb,16 Mb,32 Mb,64 Mb</source>
         <translation>2 Мб,4 Мб,6 Мб,8 Мб,16 Мб,32 Мб,64 Мб</translation>
     </message>
 </context>
 </TS>
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
@@ -1,111 +1,95 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>System</name>
     <message>
         <source>Command : </source>
         <translation>Команда :</translation>
     </message>
     <message>
         <source>State should be off</source>
         <translation>Статус должен быть &quot;выкл.&quot;</translation>
     </message>
     <message>
         <source>State should at least be off</source>
         <translation>Статус должен быть хотя бы &quot;выкл.&quot;</translation>
     </message>
 </context>
 <context>
     <name>TheNSResources</name>
     <message>
         <source>Network Device</source>
         <translation>Сетевое устройство</translation>
     </message>
     <message>
         <source>Character device</source>
         <translation>Символьное устройство</translation>
     </message>
     <message>
         <source>IP Connection</source>
         <translation>IP соединение</translation>
     </message>
     <message>
         <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>
         <source>&lt;p&gt;Connection to a GPRS capable device&lt;/p&gt;</source>
         <translation>&lt;p&gt;Соединение с GPRS-совместимым устройством&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Today Error</source>
         <translation>Ошибка Сегодня</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;Плагин &apos;%1&apos; вызвал обрушение программы Сегодня. Возможно, что плагин неправильно установлен.&lt;br&gt;Сегодня попробует продолжить загрузку плагинов.&lt;/qt&gt;</translation>
     </message>
 </context>
 <context>
     <name>networksettings2</name>
     <message>
         <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
@@ -1,100 +1,96 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation>Кнопка календаря</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation>Кнопка контактов</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation>Кнопка меню</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation>Кнопка почты</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation>Кнопка &quot;Домой&quot;</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation>Кнопка &quot;Запись&quot;</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation>Ниже+вверх</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation>Ниже+вниз</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation>Ниже+вправо</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation>Ниже+влево</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation>Выше+вверх</translation>
     </message>
     <message>
         <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>
         <source>Todo Button</source>
         <translation>Кнопка &quot;Задачи&quot;</translation>
     </message>
     <message>
         <source>Hinge1</source>
         <translation>Крышка1</translation>
     </message>
     <message>
         <source>Hinge2</source>
         <translation>Крышка2</translation>
     </message>
     <message>
         <source>Hinge3</source>
         <translation>Крышка3</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Trash</source>
         <translation>Мусор</translation>
     </message>
 </context>
 </TS>
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,1186 +1,727 @@
 <!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>
     </message>
     <message>
         <source>Week</source>
         <translation>Неделя</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Месяц</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Год</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Каждый(е):</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Периодичность</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Завершить:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Нет даты</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Повторять по</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Пнд</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Втр</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Срд</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Чтв</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Птн</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Суб</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Вск</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Каждые</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Перем1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Перем2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>НедПерем</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceWidget</name>
     <message>
         <source>No End Date</source>
         <translation>Нет даты</translation>
     </message>
     <message>
         <source>days</source>
         <translation>дней</translation>
     </message>
     <message>
         <source>day</source>
         <translation>день</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>недели</translation>
     </message>
     <message>
         <source>week</source>
         <translation>неделю</translation>
     </message>
     <message>
         <source>months</source>
         <translation>месяцев</translation>
     </message>
     <message>
         <source>month</source>
         <translation>месяц</translation>
     </message>
     <message>
         <source>years</source>
         <translation>лет</translation>
     </message>
     <message>
         <source>year</source>
         <translation>год</translation>
     </message>
     <message>
         <source> and </source>
         <translation>и</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
 и</translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, и</translation>
     </message>
     <message>
         <source>on </source>
         <translation>по</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation>Нет повтора</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>день(дней)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Повторять по</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Пнд</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Втр</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Срд</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Чтв</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Птн</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Суб</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Вск</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>неделя(и)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Повтор</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>День</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>месяц(ев)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>год(а)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Каждые</translation>
     </message>
 </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>
         <source>Edit</source>
         <translation>Правка</translation>
     </message>
     <message>
         <source>Click here to edit the selected item.</source>
         <translation>Нажмите, чтобы отредактировать выбранную запись.</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Сделать копию</translation>
     </message>
     <message>
         <source>Click here to duplicate the selected item.</source>
         <translation>Нажмите, чтобы сделать копию выбранной записи.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <source>Category:</source>
         <translation>Категория:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation>E-mail по умолчанию:</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Офис:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Раб. WEB-страница:</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>Home Web Page: </source>
         <translation>Дом. WEB-страница:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Дом. тел.:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Дом. факс:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Дом. моб.:</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation>Все Email:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Профессия:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Помощник:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Управляющий:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Муж</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Жен</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Пол:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Супруг(а):</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>День рожд.:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Годовщина:</translation>
     </message>
     <message>
         <source>Children: </source>
         <translation>Дети:</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Прозвище:</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Заметки:</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation>Начало:</translation>
     </message>
     <message>
         <source>End:</source>
         <translation>Окон.:</translation>
     </message>
     <message>
         <source>Note:</source>
         <translation>Заметка:</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Каждые</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 кажд.</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>%1 каждые</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Каждые</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Понедельник</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Вторник</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Среда</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Четверг</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Пятница</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Суббота</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Воскресение</translation>
     </message>
     <message>
-        <source>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>
         <source>Low</source>
         <translation>Низкий</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation>Очень низкий</translation>
     </message>
     <message>
         <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>
         <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;br&gt;&lt;b&gt;Дом. адрес:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>User Id</source>
         <translation>ID пользователя</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>Категории</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Титул</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Имя</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Отчество</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Фамилия</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Суффикс</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Записать как</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Должность</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Отдел</translation>
     </message>
     <message>
         <source>Company</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>Default Email</source>
         <translation>E-mail по умолчанию</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>Email адреса</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Дом. телефон</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Дом. факс</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Дом. мобильный</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Работа - улица</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Работа - город</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>Работа - область</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>Работа - индекс</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>Работа - страна</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Раб. пейджер</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Раб. WEB-страница</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Офис</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Профессия</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Помощник</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Управляющий</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Дом. - улица</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Дом. - город</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>Дом. - область</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>Дом. - индекс</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>Дом. - страна</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Дом. WEB-страница</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Супруг(а)</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Пол</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>День рожд.</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Годовщина</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Прозвище</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Дети</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Заметки</translation>
     </message>
     <message>
         <source>Has a due-date</source>
         <translation>Имеет конечный срок</translation>
     </message>
     <message>
         <source>No due-date</source>
         <translation>Нет конечного срока</translation>
     </message>
     <message>
         <source>Completed</source>
         <translation>Выполнен</translation>
     </message>
     <message>
         <source>Not completed</source>
         <translation>Не выполнен</translation>
     </message>
     <message>
         <source>No reccurrence</source>
         <translation>Не повторяется</translation>
     </message>
     <message>
         <source>No start-date</source>
         <translation>Нет даты начала</translation>
     </message>
     <message>
         <source>No completed-date</source>
         <translation>Нет даты завершения</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>й</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>й</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>й</translation>
     </message>
     <message>
         <source>th</source>
         <translation>й</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/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,1045 +1,175 @@
 <!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>
     </message>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation>ОВремПодборДиалогБаза</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Размер</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation>Тип Mime</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation>ФайлДиалог</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Открыть</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Сохранить</translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation>Выбрать каталог</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation>Имя:</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation>Стиль</translation>
     </message>
     <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>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation>Настроить ключ</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation>Изображение</translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation>Имя</translation>
     </message>
     <message>
         <source>Key</source>
         <translation>Ключ</translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation>Ключ по умолчанию</translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation>Ссылка для выбранного действия</translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation>&amp;Нет</translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation>&amp;По умолчанию</translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation>&amp;Своя</translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation>Настроить ключ</translation>
     </message>
     <message>
         <source>Default: </source>
         <translation>По умолчанию:</translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation>Ключ в черном списке</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>&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>
 </TS>
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
@@ -1,318 +1,294 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>PPPAuthEdit</name>
     <message>
         <source>Login send missing</source>
         <translation>Отправить как логин отсутствует</translation>
     </message>
     <message>
         <source>Login expect missing</source>
         <translation>Принять как логине отсутствует</translation>
     </message>
     <message>
         <source>Password send missing</source>
         <translation>Послать как пароль отсутствует</translation>
     </message>
     <message>
         <source>Password expect missing</source>
         <translation>Принять как пароль отсутствует</translation>
     </message>
     <message>
         <source>Pap/Chap/EAP client id missing</source>
         <translation>ID клиента Pap/Chap/EAP отсутствует</translation>
     </message>
     <message>
         <source>Pap/Chap/EAP server id missing</source>
         <translation>ID сервера Pap/Chap/EAP отсутствует</translation>
     </message>
     <message>
         <source>Pap/Chap/EAP secret id missing</source>
         <translation>ID секрета Pap/Chap/EAP отсутствует</translation>
     </message>
 </context>
 <context>
     <name>PPPAuthGUI</name>
     <message>
         <source>PPPAuth</source>
         <translation>PPPAут.</translation>
     </message>
     <message>
         <source>Login</source>
         <translation>Логин</translation>
     </message>
     <message>
         <source>ogin:</source>
         <translation>ogin:</translation>
     </message>
     <message>
         <source>assword:</source>
         <translation>assword:</translation>
     </message>
     <message>
         <source>Pap</source>
         <translation>PAP</translation>
     </message>
     <message>
         <source>Chap</source>
         <translation>CHAP</translation>
     </message>
     <message>
         <source>EAP</source>
         <translation>EAP</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Сервер</translation>
     </message>
     <message>
         <source>Secret</source>
         <translation>Секрет</translation>
     </message>
     <message>
         <source>*</source>
         <translation>*</translation>
     </message>
     <message>
         <source>Client</source>
         <translation>Клиент</translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation>Терминал</translation>
     </message>
 </context>
 <context>
     <name>PPPDNSEdit</name>
     <message>
         <source>Domainname needed</source>
         <translation>Необходимо доменное имя</translation>
     </message>
     <message>
         <source>DNS Servers needed</source>
         <translation>Необходимы DNS сервера</translation>
     </message>
 </context>
 <context>
     <name>PPPDNSGUI</name>
     <message>
         <source>PPPDNS</source>
         <translation>PPPDNS</translation>
     </message>
     <message>
         <source>Server assigned</source>
         <translation>Задан сервером</translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation>Постоянный</translation>
     </message>
     <message>
         <source>DomainName</source>
         <translation>Доменное имя</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Адрес</translation>
     </message>
     <message>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
         <source>List</source>
         <translation>Список</translation>
     </message>
 </context>
 <context>
     <name>PPPDialingGUI</name>
     <message>
         <source>PPPDialing</source>
         <translation>PPP набор</translation>
     </message>
     <message>
         <source>Dialing</source>
         <translation>Набор</translation>
     </message>
     <message>
         <source>GPRS</source>
         <translation>GPRS</translation>
     </message>
     <message>
         <source>APN</source>
         <translation>APN</translation>
     </message>
     <message>
         <source>Dialup</source>
         <translation>Модем</translation>
     </message>
     <message>
         <source>Number</source>
         <translation>Номер</translation>
     </message>
     <message>
         <source>Commands</source>
         <translation>Команды</translation>
     </message>
     <message>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
         <source>New Item</source>
         <translation>Новая запись</translation>
     </message>
 </context>
 <context>
     <name>PPPGUI</name>
     <message>
         <source>PPP</source>
         <translation>PPP</translation>
     </message>
     <message>
         <source>Authentication</source>
         <translation>Аутентификация</translation>
     </message>
     <message>
         <source>IP settings</source>
         <translation>Настройки IP</translation>
     </message>
     <message>
         <source>DNS Settings</source>
         <translation>Настройки DNS</translation>
     </message>
     <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>
         <translation>PPPIP</translation>
     </message>
     <message>
         <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>
         <source>Local</source>
         <translation>Местный</translation>
     </message>
     <message>
         <source>Server Overrules</source>
         <translation>Отменяется сервером</translation>
     </message>
     <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>
         <translation>PPP Запуск</translation>
     </message>
     <message>
         <source>Upon connect</source>
         <translation>При соединении</translation>
     </message>
     <message>
         <source>Before</source>
         <translation>До</translation>
     </message>
     <message>
         <source>After</source>
         <translation>После</translation>
     </message>
     <message>
         <source>Upon disconnect</source>
         <translation>При рассоединении</translation>
     </message>
     <message>
         <source>&lt;UL&gt;
 &lt;LI&gt;Commands run under your &lt;b&gt;real&lt;/b&gt; user id (&lt;b&gt;not&lt;/b&gt; as root)&lt;/LI&gt;
 &lt;LI&gt;Supply the whole path&lt;/LI&gt;
 &lt;/UL&gt;</source>
         <translation>&lt;UL&gt;
 &lt;LI&gt;Команды, запущенные под вашим &lt;b&gt;настоящим&lt;/b&gt; ID пользователя (&lt;b&gt;не&lt;/b&gt; как root)&lt;/LI&gt;
 &lt;LI&gt;Задайте полный путь&lt;/LI&gt;
 &lt;/UL&gt;</translation>
     </message>
 </context>
 </TS>
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
@@ -1,164 +1,152 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ProfileGUI</name>
     <message>
         <source>Profile</source>
         <translation>Профиль</translation>
     </message>
     <message>
         <source>Setup</source>
         <translation>Настройка</translation>
     </message>
     <message>
         <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>
         <source>eth0</source>
         <translation>eth0</translation>
     </message>
     <message>
         <source>(Multicast, Up)</source>
         <translation>(Широковещание, Вкл.)</translation>
     </message>
     <message>
         <source>Subnet Mask</source>
         <translation>Маска подсети</translation>
     </message>
     <message>
         <source>Broadcast</source>
         <translation>Широковещательный</translation>
     </message>
     <message>
         <source>MAC</source>
         <translation>MAC</translation>
     </message>
     <message>
         <source>P-t-P</source>
         <translation>Точка-точка</translation>
     </message>
     <message>
         <source>IP Address</source>
         <translation>IP адрес</translation>
     </message>
     <message>
         <source>0.0.0.0</source>
         <translation>0.0.0.0</translation>
     </message>
     <message>
         <source>00:00:00:00:00:00</source>
         <translation>00:00:00:00:00:00</translation>
     </message>
     <message>
         <source>DHCP</source>
         <translation>DHCP</translation>
     </message>
     <message>
         <source>Lease Expires</source>
         <translation>Аренда истекает</translation>
     </message>
     <message>
         <source>Lease Obtained</source>
         <translation>Аренда получена</translation>
     </message>
     <message>
         <source>DHCP Server</source>
         <translation>DHCP сервер</translation>
     </message>
     <message>
         <source>Traffic</source>
         <translation>Трафик</translation>
     </message>
     <message>
         <source>Receiving</source>
         <translation>Входящий</translation>
     </message>
     <message>
         <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>
         <source>Pkt</source>
         <translation>Пакет</translation>
     </message>
     <message>
         <source>ODO</source>
         <translation>ODO</translation>
     </message>
     <message>
         <source>Sending</source>
         <translation>Отправляется</translation>
     </message>
     <message>
         <source>Miscellaneous</source>
         <translation>Прочие</translation>
     </message>
     <message>
         <source>Reset ODO</source>
         <translation>Сбросить ODO</translation>
     </message>
 </context>
 <context>
     <name>ProfileNetNode</name>
     <message>
         <source>Regular connection profile</source>
         <translation>Обычный профиль соединения</translation>
     </message>
     <message>
         <source>&lt;p&gt;Define use of an IP connection.&lt;/p&gt;&lt;p&gt;Configure if and when this connection needs to be established&lt;/p&gt;</source>
         <translation>&lt;p&gt;Задайте назначение IP соединения.&lt;/p&gt;&lt;p&gt;Укажите при каких условиях и когда нужно активировать это соединение&lt;/p&gt;</translation>
     </message>
 </context>
 </TS>
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
@@ -1,1025 +1,993 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation>Все</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Без категории</translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation>(мульти)</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Служебные</translation>
     </message>
     <message>
         <source>Personal</source>
         <translation>Личные</translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation>(Мульти)</translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation>Все</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>Новая категория</translation>
     </message>
     <message>
         <source>New Category </source>
         <translation>Новая категория</translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation>Категории</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>Категории</translation>
     </message>
     <message>
         <source>Application</source>
         <translation>Приложение</translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation>Здесь находятся категории</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Добавить</translation>
     </message>
     <message>
         <source>Global</source>
         <translation>Глобальный</translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation>Отметьте категории к которым относится документ.</translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation>Здесь введите новую категорию.  Нажмите &lt;b&gt;Добавить&lt;/b&gt; чтобы добавить её в список.</translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation>Введите новую категорию слева и нажмите чтобы добавить её в список.</translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation>Нажмите чтобы удалить выделенную категорию.</translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation>Отметьте чтобы это свойство было доступно всем приложениям.</translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation>Все</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Без категории</translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation>Извините, другое приложение
 редактирует категории.</translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation>Изменить категории</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Все</translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation>Показать январь выбранного года</translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation>Показать предыдущий месяц</translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation>Показать следующий месяц</translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation>Показать декабрь выбранного года</translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation>Закрыть Выбор Файла</translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation>Показать документы этого типа</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Просмотр документа</translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation>Показать документы в этой категории</translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation>Нажмите чтобы выбрать документ из списка</translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation>, или выберите&lt;b&gt;Новый документ&lt;/b&gt;  чтобы создать новый документ.</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation>&lt;br&gt;&lt;br&gt;Нажмите и удерживайте чтобы увидеть свойства.</translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <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>
         <source>Find what:</source>
         <translation>Что найти:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Категория:</translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation>Начать поиск в:</translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation>Дек 02 01</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Учет регистра</translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation>Искать в обратном направлении</translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Document View</source>
         <translation>Просмотр документа</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation>Не удалось удалить файл.</translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation>Копия</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Сдублировать</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>Не удалось скопировать файл.</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Детали</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>Не удалось переместить документ.</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Жесткий диск</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Свойства</translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation>Детали</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>Описание:</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Тип:</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Имя:</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Расположение:</translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation>Быстрый запуск (расходует память)</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Копировать</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Отправить</translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation>Тип устройства на котором находится документ.</translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation>Имя этого документа.</translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation>Загрузить это приложение чтобы оно было моментально доступно.</translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation>Удалить этот документ.</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation>Сделать копию этого документа.</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation>Отправить этот документ на другое устройство.</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation>Использовать свое вращение</translation>
     </message>
     <message>
         <source>Arguments:</source>
         <translation>Аргументы:</translation>
     </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>Информация о владельце</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Да</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Введите пароль</translation>
     </message>
 </context>
 <context>
     <name>QMessageBox</name>
     <message>
         <source>Yes</source>
         <translation>Да</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Нет</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Нет места</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>Во время создания файла
 настроек для этой программы
 произошла ошибка.
 
 Пожалуйста освободите место и
 попробуйте снова.</translation>
     </message>
     <message>
         <source>Unable to create start up files
 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>
         <source>year</source>
         <translation>год</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</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>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Дом. адрес:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation>Адреса Email:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Дом. телефон:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Дом. Факс:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Дом. мобильный:</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Дом. WEB-страница:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Раб. WEB-страница:</translation>
     </message>
     <message>
         <source>Office: </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>Profession: </source>
         <translation>Профессия:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Помощник:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Управляющий:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Муж</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Жен</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Пол:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Супруг(а):</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>День рожд.:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Годовщина:</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Прозвище:</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Титул</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Имя</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Отчество</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Фамилия</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Суффикс</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Файл</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Должность</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Отдел</translation>
     </message>
     <message>
         <source>Company</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>Default Email</source>
         <translation>Email по умолчанию</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>Email</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Дом. телефон</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Дом. факс</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Дом. мобильный</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Раб. улица</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Раб. город</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>Раб. область</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>Раб. индекс</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>Страна(раб.)</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Раб. пейджер</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Раб. WEB-страница</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Офис</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Профессия</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Помощник</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Управляющий</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Дом. улица</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Дом. город</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>Дом. область</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>Дом. индекс</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>Страна(дом.)</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Дом. WEB-страница</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Супруг(а)</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Пол</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>День рожд.</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Годовщина</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Прозвище</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Дети</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Заметки</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Группы</translation>
     </message>
     <message>
         <source>New Document</source>
         <translation>Новый документ</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Пнд</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Втр</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Срд</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Чтв</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <source>Jan</source>
         <translation>Янв</translation>
     </message>
     <message>
         <source>Feb</source>
         <translation>Фев</translation>
     </message>
     <message>
         <source>Mar</source>
         <translation>Мар</translation>
     </message>
     <message>
         <source>Apr</source>
         <translation>Апр</translation>
     </message>
     <message>
         <source>May</source>
         <translation>Май</translation>
     </message>
     <message>
         <source>Jun</source>
         <translation>Июнь</translation>
     </message>
     <message>
         <source>Jul</source>
         <translation>Июль</translation>
     </message>
     <message>
         <source>Aug</source>
         <translation>Авг</translation>
     </message>
     <message>
         <source>Sep</source>
         <translation>Сен</translation>
     </message>
     <message>
         <source>Oct</source>
         <translation>Окт</translation>
     </message>
     <message>
         <source>Nov</source>
         <translation>Нояб</translation>
     </message>
     <message>
         <source>Dec</source>
         <translation>Дек</translation>
     </message>
     <message>
         <source>D</source>
         <comment>Shortcut for Day</comment>
         <translation>Д</translation>
     </message>
     <message>
         <source>M</source>
         <comment>Shortcur for Month</comment>
         <translation>М</translation>
     </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation>%1 документ</translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation>Пожалуйста подождите...</translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation>Нажмите чтобы закрыть это окно, не сохраняя.</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation>Нажмите чтобы закрыть это окно.</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation>Нажмите чтобы закрыть это окно и сохранить изменения.</translation>
     </message>
     <message>
         <source>Click to make this window movable.</source>
         <translation>Нажмите чтобы сделать это окно перемещаемым.</translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
         <translation>Нажмите чтобы это окно заняло все доступное место на экране.</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation>Восстановить</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>Переместить</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Размер</translation>
     </message>
     <message>
         <source>Maximize</source>
         <translation>Распахнуть</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>CF карта</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Жесткий диск</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>SD карта</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>SCSI Жесткий диск</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Внутреннее хранилище</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>Внутренняя память</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>MMC карта</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>Нет</translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation>citytime программа не найдена</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation>Чтобы выбирать часовоые пояса,
 пожалуйста установите citytime.</translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Нет места</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Не могу установить будильник.
 Пожалуйста освободите место и попробуйте снова</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>%1 файлы</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>%1 %2</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>Все %1 файлы</translation>
     </message>
     <message>
         <source>All files</source>
         <translation>Все файлы</translation>
     </message>
 </context>
 <context>
     <name>WindowDecoration</name>
     <message>
         <source>Default</source>
         <comment>List box text for default window decoration</comment>
         <translation>По умолчанию</translation>
     </message>
 </context>
 </TS>
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,114 +1,102 @@
 <!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>
         <source>Colors for the headlines !</source>
         <translation>Цвета заголовков !</translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
         <translation>Цвет записи:</translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation>Этот цвет будет использован для показа юбилеев/дней рождений !</translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation>Срочный цвет
 если меньше</translation>
     </message>
     <message>
         <source> days: </source>
         <translation>дней:</translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation>Этот цвет будет использован если мы приближаемся к событию !</translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation>&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>
         <source>The next birthdays will just be shown, if enabled!</source>
         <translation>Следующие дни рождения будут показаны, если разрешены!</translation>
     </message>
     <message>
         <source>The next anniversaries will just be shown, if enabled !</source>
         <translation>Следующие юбилеи будут показаны, если разрешены!</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>AddressBook plugin</source>
         <translation>Плагин Адресной Книги</translation>
     </message>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>Дни рождения в течении след. &lt;b&gt; %1 &lt;/b&gt; дней:</translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>Нет дней рождений в течении &lt;b&gt; %1 &lt;/b&gt; дней!</translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>Юбилеи в течении след. &lt;b&gt; %1 &lt;/b&gt; дней:</translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>Нет юбилеев в течении след. &lt;b&gt; %1 &lt;/b&gt; дней!</translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation>База данных не предоставляет эту опцию поиска ! Пожалуйста обновите libOpie !&lt;br&gt;</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ru/libtodayweatherplugin.ts b/i18n/ru/libtodayweatherplugin.ts
index 52260da..532b37d 100644
--- a/i18n/ru/libtodayweatherplugin.ts
+++ b/i18n/ru/libtodayweatherplugin.ts
@@ -1,121 +1,117 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>Weather plugin</source>
         <translation>Плагин Погода</translation>
     </message>
 </context>
 <context>
     <name>WeatherPluginConfig</name>
     <message>
         <source>Enter ICAO location identifier:</source>
         <translation>Введите идентификатор области ICAO:</translation>
     </message>
     <message>
         <source>Enter the 4 letter code for the desired location here.  See http://www.nws.noaa.gov/tg/siteloc.shtml to find a location near you.</source>
         <translation>Здесь введите 4-значный код вашей станции. Загляните на http://www.nws.noaa.gov/tg/siteloc.shtml чтобы его найти.</translation>
     </message>
     <message>
         <source>Visit http://www.nws.noaa.gov/tg/siteloc.shtml to find the nearest location.</source>
         <translation>Зайдите на http://www.nws.noaa.gov/tg/siteloc.shtml чтобы найти ближайшее место.</translation>
     </message>
     <message>
         <source>Use metric units</source>
         <translation>Метрическая система</translation>
     </message>
     <message>
         <source>Click here to select type of units displayed.</source>
         <translation>Нажмите чтобы изменить тип системы мер.</translation>
     </message>
     <message>
         <source>Update frequency (in minutes):</source>
         <translation>Частота обновлений (в минутах):</translation>
     </message>
     <message>
         <source>Select how often (in minutes) you want the weather to be updated.</source>
         <translation>Выберите как часто (в минутах) вы хотите обновлять сведения.</translation>
     </message>
 </context>
 <context>
     <name>WeatherPluginWidget</name>
     <message>
         <source>Retreiving current weather information.</source>
         <translation>Запрашиваю текущие сведения о погоде.</translation>
     </message>
     <message>
         <source>Temp: </source>
         <translation>Темп.:</translation>
     </message>
     <message>
         <source>  Wind: </source>
         <translation>Ветер:</translation>
     </message>
     <message>
         <source>
 Pres: </source>
         <translation>
 Давл.:</translation>
     </message>
     <message>
         <source>Current weather data not available.</source>
         <translation>Текущая информация недоступна.</translation>
     </message>
     <message>
         <source>n/a</source>
         <translation>н/д</translation>
     </message>
     <message>
         <source>E </source>
         <translation>В</translation>
     </message>
     <message>
         <source>NE </source>
         <translation>СВ</translation>
     </message>
     <message>
         <source>N </source>
         <translation>С</translation>
     </message>
     <message>
         <source>NW </source>
         <translation>СЗ</translation>
     </message>
     <message>
         <source>W </source>
         <translation>З</translation>
     </message>
     <message>
         <source>SW </source>
         <translation>ЮЗ</translation>
     </message>
     <message>
         <source>S </source>
         <translation>Ю</translation>
     </message>
     <message>
         <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
@@ -1,40 +1,36 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>VPNGUI</name>
     <message>
         <source>VPN</source>
         <translation>VPN</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Описание</translation>
     </message>
     <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,37 +1,33 @@
 <!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>
         <source>Game</source>
         <translation>Игра</translation>
     </message>
     <message>
         <source>Mine Sweep</source>
         <translation>Сапер</translation>
     </message>
 </context>
 </TS>
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
@@ -410,523 +410,503 @@
     <message>
         <source>Device</source>
         <translation>Устройство</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Configure Profiles</source>
         <translation>Настроить профили</translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation>Новое соединение</translation>
     </message>
     <message>
         <source>Save Connection</source>
         <translation>Сохранить соединение</translation>
     </message>
     <message>
         <source>Connect</source>
         <translation>Соединиться</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>Отсоединиться</translation>
     </message>
     <message>
         <source>QuickLaunch</source>
         <translation>БыстрЗапуск</translation>
     </message>
     <message>
         <source>The shell button launches the &quot;default&quot; profile. If there is none default values are taken</source>
         <translation>Кнопка оболочки запускает профиль &quot;default&quot;. Если такого нету, задаются значения по умолчанию</translation>
     </message>
     <message>
         <source>Transfer file...</source>
         <translation>Переместить файл...</translation>
     </message>
     <message>
         <source>Line wrap</source>
         <translation>Перенос строк</translation>
     </message>
     <message>
         <source>Full screen</source>
         <translation>Полный экран</translation>
     </message>
     <message>
         <source>Save history</source>
         <translation>Сохр. историю</translation>
     </message>
     <message>
         <source>Terminate</source>
         <translation>Завершить</translation>
     </message>
     <message>
         <source>Close Window</source>
         <translation>Закрыть окно</translation>
     </message>
     <message>
         <source>Run Script</source>
         <translation>Запустить скрипт</translation>
     </message>
     <message>
         <source>Record Script</source>
         <translation>Записать скрипт</translation>
     </message>
     <message>
         <source>Save Script</source>
         <translation>Сохр. скрипт</translation>
     </message>
     <message>
         <source>Open Keyboard...</source>
         <translation>Открыть клавиатуру...</translation>
     </message>
     <message>
         <source>New from Profile</source>
         <translation>Новый из профиля</translation>
     </message>
     <message>
         <source>Connection</source>
         <translation>Соединение</translation>
     </message>
     <message>
         <source>Scripts</source>
         <translation>Скрипты</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Копировать</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Вставить</translation>
     </message>
     <message>
         <source>Script</source>
         <translation>Скрипт</translation>
     </message>
     <message>
         <source>&lt;qt&gt;There is no Connection.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Нет соединения.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>History</source>
         <translation>История</translation>
     </message>
     <message>
         <source>New Profile</source>
         <translation>Новый профиль</translation>
     </message>
     <message>
         <source>Save Profile</source>
         <translation>Сохранить профиль</translation>
     </message>
     <message>
         <source>Start log</source>
         <translation>Начать журнал</translation>
     </message>
     <message>
         <source>Stop log</source>
         <translation>Закончить журнал</translation>
     </message>
     <message>
         <source>Log</source>
         <translation>Журнал</translation>
     </message>
 </context>
 <context>
     <name>ModemConfigWidget</name>
     <message>
         <source>Modem is attached to:</source>
         <translation>Модем подключен к:</translation>
     </message>
     <message>
         <source>Enter telefon number here:</source>
         <translation>Введите номер телефона:</translation>
     </message>
     <message>
         <source>AT commands</source>
         <translation>AT команды</translation>
     </message>
     <message>
         <source>Enter number</source>
         <translation>Введите номер</translation>
     </message>
 </context>
 <context>
     <name>NoOptions</name>
     <message>
         <source>This Plugin does not support any configurations</source>
         <translation>Этот плагин не поддерживает никаких конфигураций</translation>
     </message>
 </context>
 <context>
     <name>ProfileEditorDialog</name>
     <message>
         <source>Connection</source>
         <translation>Соединение</translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation>Терминал</translation>
     </message>
     <message>
         <source>Auto connect after load</source>
         <translation>Авто-соединение после загрузки</translation>
     </message>
     <message>
         <source>Local Console</source>
         <translation>Местная консоль</translation>
     </message>
     <message>
         <source>New Profile</source>
         <translation>Новый профиль</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Opie Console</source>
         <translation>Консоль Opie</translation>
     </message>
     <message>
         <source>Failed</source>
         <translation>Неудача</translation>
     </message>
     <message>
         <source>Connecting failed for this session.</source>
         <translation>Соединение не удалось для этого сеанса.</translation>
     </message>
     <message>
         <source>Session failed</source>
         <translation>Сеанс не удался</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Cannot open session: Not all components were found.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Не могу открыть сеанс: Не все компоненты найдены.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Transfer mode</source>
         <translation>Режим передачи</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Отправить</translation>
     </message>
     <message>
         <source>Receive</source>
         <translation>Принять</translation>
     </message>
     <message>
         <source>Send file</source>
         <translation>Отправить файл</translation>
     </message>
     <message>
         <source>Transfer protocol</source>
         <translation>Протокол передачи</translation>
     </message>
     <message>
         <source>Progress</source>
         <translation>Состояние</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Статус</translation>
     </message>
     <message>
         <source>Ready</source>
         <translation>Готов</translation>
     </message>
     <message>
         <source>Start transfer</source>
         <translation>Начать передачу</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
         <source>File transfer</source>
         <translation>Передача файла</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation>Внимание</translation>
     </message>
     <message>
         <source>No file has been specified.</source>
         <translation>Не задан ни один файл.</translation>
     </message>
     <message>
         <source>Sending...</source>
         <translation>Отправляю...</translation>
     </message>
     <message>
         <source>Receiving...</source>
         <translation>Принимаю...</translation>
     </message>
     <message>
         <source>Cancelled</source>
         <translation>Отменено</translation>
     </message>
     <message>
         <source>The file transfer has been cancelled.</source>
         <translation>Передача файла была отменена.</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
         <source>Operation not supported.</source>
         <translation>Действие не поддерживается.</translation>
     </message>
     <message>
         <source>Transfer could not be started.</source>
         <translation>Не удалось начать передачу.</translation>
     </message>
     <message>
         <source>No error.</source>
         <translation>Нет ошибок.</translation>
     </message>
     <message>
         <source>Undefined error occured.</source>
         <translation>Произошла неопределенная ошибка.</translation>
     </message>
     <message>
         <source>Incomplete transfer.</source>
         <translation>Незаконченная передача.</translation>
     </message>
     <message>
         <source>Unknown error occured.</source>
         <translation>Произошла неизвестная ошибка.</translation>
     </message>
     <message>
         <source>Sent</source>
         <translation>Отправлен</translation>
     </message>
     <message>
         <source>File has been sent.</source>
         <translation>Файл был отправлен.</translation>
     </message>
     <message>
         <source>Received</source>
         <translation>Принят</translation>
     </message>
     <message>
         <source>File has been received.</source>
         <translation>Файл был принят.</translation>
     </message>
     <message>
         <source>Profile name</source>
         <translation>Имя профиля</translation>
     </message>
     <message>
         <source>Profile</source>
         <translation>Профиль</translation>
     </message>
     <message>
         <source>Connection</source>
         <translation>Соединение</translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation>Терминал</translation>
     </message>
     <message>
         <source>Special Keys</source>
         <translation>Особые клавиши</translation>
     </message>
     <message>
         <source>Invalid profile</source>
         <translation>Неверный профиль</translation>
     </message>
     <message>
         <source>Please enter a profile name.</source>
         <translation>Пожалуйста введите имя прфиля.</translation>
     </message>
     <message>
         <source>Z-Modem</source>
         <translation>Z-Модем</translation>
     </message>
     <message>
         <source>Y-Modem</source>
         <translation>Y-Модем</translation>
     </message>
     <message>
         <source>X-Modem</source>
         <translation>X-Модем</translation>
     </message>
     <message>
         <source>Serial</source>
         <translation>Серийный</translation>
     </message>
     <message>
         <source>Modem</source>
         <translation>Модем</translation>
     </message>
     <message>
         <source>Local Console</source>
         <translation>Местная консоль</translation>
     </message>
     <message>
         <source>Default Terminal</source>
         <translation>Терминал по умолчанию</translation>
     </message>
     <message>
         <source>Default Keyboard</source>
         <translation>Клавиатура по умолчанию</translation>
     </message>
     <message>
         <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>
         <source>Reset speakers</source>
         <translation>Сбросить динамики</translation>
     </message>
     <message>
         <source>Turning off dialtone</source>
         <translation>Отключить зуммер</translation>
     </message>
     <message>
         <source>Dial number</source>
         <translation>Набрать номер</translation>
     </message>
     <message>
         <source>Line busy, redialing number</source>
         <translation>Линия занята, набираю снова</translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation>Соединение установлено</translation>
     </message>
     <message>
         <source>Dismiss</source>
         <translation>Закрыть</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Dialing the number failed.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Набор номера неудался.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Fixing up Embedix</source>
         <translation>Подправляю Embedix</translation>
     </message>
 </context>
 <context>
     <name>SerialConfigWidget</name>
     <message>
         <source>Device</source>
         <translation>Устройство</translation>
     </message>
 </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>
         <source>Options</source>
         <translation>Опции</translation>
     </message>
     <message>
         <source>Local echo</source>
         <translation>Местное эхо</translation>
     </message>
     <message>
         <source>Line wrap</source>
         <translation>Перенос строк</translation>
     </message>
     <message>
         <source>VT 100</source>
         <translation>VT 100</translation>
     </message>
     <message>
         <source>VT 102</source>
         <translation>VT 102</translation>
     </message>
     <message>
         <source>Linux Console</source>
         <translation>Linux консоль</translation>
     </message>
     <message>
         <source>X-Terminal</source>
         <translation>X-Терминал</translation>
     </message>
     <message>
         <source>black on white</source>
         <translation>черный на белом</translation>
     </message>
     <message>
         <source>white on black</source>
         <translation>белый на черном</translation>
     </message>
     <message>
         <source>green on black</source>
         <translation>зеленый на черном</translation>
     </message>
     <message>
         <source>orange on black</source>
         <translation>оранжевый на черном</translation>
     </message>
 </context>
 </TS>
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
@@ -1,316 +1,328 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BaseSetup</name>
     <message>
         <source> seconds</source>
         <translation>секунд</translation>
     </message>
     <message>
         <source>Slideshow timeout:</source>
         <translation>Таймаут презентации:</translation>
     </message>
     <message>
         <source> pixel</source>
         <translation>пикселей</translation>
     </message>
     <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>
         <source>Toggle autoscale</source>
         <translation>Включить авто размер</translation>
     </message>
     <message>
         <source>Switch to next image</source>
         <translation>Следующее изображение</translation>
     </message>
     <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>
         <source>Delete Current Item</source>
         <translation>Удалить текущий</translation>
     </message>
     <message>
         <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>
         <source>Imageinfo Keyboard Actions</source>
         <translation>Информация - Действия клавиатуры</translation>
     </message>
     <message>
         <source>Imageview Keyboard Actions</source>
         <translation>Изображение - Действия клавиатуры</translation>
     </message>
     <message>
         <source>Go dir up</source>
         <translation>Родительский каталог</translation>
     </message>
     <message>
         <source>Beam file</source>
         <translation>Отправить файл</translation>
     </message>
     <message>
         <source>Show imageinfo</source>
         <translation>Показать информацию</translation>
     </message>
     <message>
         <source>Delete file</source>
         <translation>Удалить файл</translation>
     </message>
     <message>
         <source>Display image</source>
         <translation>Показать изображение</translation>
     </message>
     <message>
         <source>Start slideshow</source>
         <translation>Начать презентацию слайдов</translation>
     </message>
     <message>
         <source>Show toolbar</source>
         <translation>Показать панель</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Настройки</translation>
     </message>
     <message>
         <source>Thumbnail and Imageinfo</source>
         <translation>Значок и информация</translation>
     </message>
     <message>
         <source>Thumbnail and name</source>
         <translation>Значок и имя</translation>
     </message>
     <message>
         <source>Name only</source>
         <translation>Только имя</translation>
     </message>
     <message>
         <source>Next image</source>
         <translation>Следующее</translation>
     </message>
     <message>
         <source>Previous image</source>
         <translation>Предыдущее</translation>
     </message>
     <message>
         <source>Show images fullscreen</source>
         <translation>Показать на полный экран</translation>
     </message>
     <message>
         <source>Auto rotate images</source>
         <translation>Авто поворот изображений</translation>
     </message>
     <message>
         <source>Show images unscaled</source>
         <translation>Исходный размер</translation>
     </message>
     <message>
         <source>Show zoomer window when unscaled</source>
         <translation>Показывать окно масштаба при исходном размере</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Файл</translation>
     </message>
     <message>
         <source>Show</source>
         <translation>Показать</translation>
     </message>
     <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>
         <source>&lt;center&gt;&lt;b&gt;Be carefull with the following options!&lt;/b&gt;&lt;/center&gt;</source>
         <translation>&lt;center&gt;&lt;b&gt;Будьте осторожны со следующими опциями!&lt;/b&gt;&lt;/center&gt;</translation>
     </message>
     <message>
         <source>Show files recursive</source>
         <translation>Показывать файлы рекурсивно</translation>
     </message>
     <message>
         <source>Recursion depth:</source>
         <translation>Глубина рекурсии:</translation>
     </message>
     <message>
         <source> directories</source>
         <translation>каталоги</translation>
     </message>
     <message>
         <source>Digital Camera View</source>
         <translation>Цифровая камера</translation>
     </message>
     <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>
         <source>Name Only</source>
         <translation>Только имя</translation>
     </message>
 </context>
 <context>
     <name>imageinfo</name>
     <message>
         <source>View Full Image</source>
         <translation>Просморт всего изображения</translation>
     </message>
     <message>
         <source>Image info</source>
         <translation>Информация</translation>
     </message>
     <message>
         <source>Displays an thumbnail of the image</source>
         <translation>Показывает значок изображения</translation>
     </message>
     <message>
         <source>Displays info of selected image</source>
         <translation>Показывает информацию о текущем изображении</translation>
     </message>
 </context>
 </TS>
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
@@ -1,429 +1,273 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Title</source>
         <translation>Заголовок</translation>
     </message>
     <message>
         <source>Author</source>
         <translation>Автор</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Описание</translation>
     </message>
     <message>
         <source>Copyright</source>
         <translation>Копирайт</translation>
     </message>
     <message>
         <source>Creation Time</source>
         <translation>Время создания</translation>
     </message>
     <message>
         <source>Software</source>
         <translation>Программа</translation>
     </message>
     <message>
         <source>Disclaimer</source>
         <translation>Отречение</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Предупреждение</translation>
     </message>
     <message>
         <source>Source</source>
         <translation>Исходник</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Примечания</translation>
     </message>
     <message>
         <source>Grayscale</source>
         <translation>Черно-белое</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Неизвестный</translation>
     </message>
     <message>
         <source>RGB</source>
         <translation>RGB</translation>
     </message>
     <message>
         <source>Palette</source>
         <translation>Палитра</translation>
     </message>
     <message>
         <source>Grayscale/Alpha</source>
         <translation>Оттенки серого/Альфа</translation>
     </message>
     <message>
         <source>RGB/Alpha</source>
         <translation>RGB/Альфа</translation>
     </message>
     <message>
         <source>Deflate</source>
         <translation>Сдуть</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Нет</translation>
     </message>
     <message>
         <source>Adam7</source>
         <translation>Adam7</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Not a GIF file</source>
         <translation>Не GIF файл</translation>
     </message>
     <message>
         <source>Dimensions: %1x%2
 </source>
         <translation>Размер: %1x%2
 </translation>
     </message>
     <message>
         <source>Depth: %1 bits
 </source>
         <translation>Глубина: %1 бит
 </translation>
     </message>
     <message>
         <source>Sort Flag: %1
 </source>
         <translation>Флаг сортировки: %1
 </translation>
     </message>
     <message>
         <source>Size of Global Color Table: %1 colors
 </source>
         <translation>Размер глобальной таблицы цветов: %1 цветов
 </translation>
     </message>
     <message>
         <source>Background Color Index: %1
 </source>
         <translation>Индекс цвета фона: %1</translation>
     </message>
     <message>
         <source>Pixel Aspect Ratio: %1 (Aspect Ratio %2)
 </source>
         <translation>Соотношение пикселей: %1 (Соотношение %2)
 </translation>
     </message>
     <message>
         <source>Comment: %1
 </source>
         <translation>Примечания: %1
 </translation>
     </message>
     <message>
         <source>Depth: %1
 </source>
         <translation>Глубина: %1
 </translation>
     </message>
     <message>
         <source>ColorMode: %1
 </source>
         <translation>Цветовой режим: %1
 </translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Неизвестный</translation>
     </message>
     <message>
         <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>
         <source>Manufacturer: %1
 </source>
         <translation>Производитель: %1
 </translation>
     </message>
     <message>
         <source>Model: %1
 </source>
         <translation>Модель: %1
 </translation>
     </message>
     <message>
         <source>Orientation: %1
 </source>
         <translation>Ориентация: %1
 </translation>
     </message>
     <message>
         <source>Flash used
 </source>
         <translation>Вспышка
 </translation>
     </message>
     <message>
         <source>Focal length: %1
 </source>
         <translation>Фокусное расстояние: %1
 </translation>
     </message>
     <message>
         <source>35mm equivalent: %1
 </source>
         <translation>35mm эквивалент: %1
 </translation>
     </message>
     <message>
         <source>CCD width: %1</source>
         <translation>CCD ширина: %1</translation>
     </message>
     <message>
         <source>Exposure time: %1
 </source>
         <translation>Выдержка: %1
 </translation>
     </message>
     <message>
         <source>Aperture: %1
 </source>
         <translation>Апертура: %1
 </translation>
     </message>
     <message>
         <source>Distance: %1
 </source>
         <translation>Расстояние: %1
 </translation>
     </message>
     <message>
         <source>Infinite</source>
         <translation>Бесконечность</translation>
     </message>
     <message>
         <source>ISO equivalent: %1
 </source>
         <translation>ISO эквивалент: %1
 </translation>
     </message>
     <message>
         <source>EXIF comment: %1</source>
         <translation>EXIF примечания: %1</translation>
     </message>
     <message>
         <source>&lt;/qt&gt;</source>
         <translation>&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Dimensions: %1 x %2
 </source>
         <translation>Размер: %1 x %2
 </translation>
     </message>
     <message>
         <source>Size: %1
 </source>
         <translation>Размер: %1
 </translation>
     </message>
     <message>
         <source>Compressed size: %1</source>
         <translation>Размер после сжатия: %1</translation>
     </message>
     <message>
         <source>used colors: %1
 </source>
         <translation>использовано цветов: %1
 </translation>
     </message>
     <message>
         <source>Resolution: %1 x %2
 </source>
         <translation>Разрешение: %1 x %2
 </translation>
     </message>
 </context>
 </TS>
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,134 +1,126 @@
 <!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>
         <source>User</source>
         <translation>Пользователь</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Пароль</translation>
     </message>
     <message>
         <source>Suspend</source>
         <translation>Выключить</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Меню</translation>
     </message>
 </context>
 <context>
     <name>LoginWindowImpl</name>
     <message>
         <source>Restart</source>
         <translation>Перезагрузить</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>Выйти</translation>
     </message>
     <message>
         <source>Wrong password</source>
         <translation>Неверный пароль</translation>
     </message>
     <message>
         <source>The given password is incorrect.</source>
         <translation>Введенный пароль неверен.</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Провал</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>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>
     <message>
         <source>&lt;b&gt;Password:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Пароль:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Confirm:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Подтвердите:&lt;/b&gt;</translation>
     </message>
 </context>
 <context>
     <name>PasswordDialogImpl</name>
     <message>
         <source>Trying to leave without password set</source>
         <translation>Пытаюсь выйти без задания пароля</translation>
     </message>
     <message>
         <source>&lt;qt&gt;No password was set. This could lead to you not beeingable to remotely connect to your machine.Do you want to continue not setting a password?&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Не был задан пароль. Это может привести к невозможности удаленного подключения к вашей машине. Вы действительно хотите продолжить без задания пароля?&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Passwords don&apos;t match</source>
         <translation>Пароли не совпадают</translation>
     </message>
     <message>
         <source>&lt;qt&gt;The two passwords don&apos;t match. Please try again.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Это два пароля не совпадают. Попробуйте снова.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Password not legal</source>
         <translation>Недопустимый пароль</translation>
     </message>
     <message>
         <source>&lt;qt&gt;The entered password is not a valid password.Please try entering a valid password.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Введеный пароль недопустим. Пожалуйста попробуйте ввести допустимый пароль.&lt;/qt&gt;</translation>
     </message>
 </context>
 </TS>
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
@@ -1,759 +1,723 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DCCProgress</name>
     <message>
         <source>Receiving file %1 from %2...</source>
         <translation>Принимаю файл %1 от %2...</translation>
     </message>
     <message>
         <source>Successfully received %1</source>
         <translation>Успешно принял %1</translation>
     </message>
     <message>
         <source>Aborted</source>
         <translation>Отменено</translation>
     </message>
     <message>
         <source>Peer Aborted</source>
         <translation>Отменено</translation>
     </message>
     <message>
         <source>Timeout</source>
         <translation>Таймаут</translation>
     </message>
 </context>
 <context>
     <name>DCCTransferTab</name>
     <message>
         <source>DCC Transfers in Progress</source>
         <translation>Идет передача DCC</translation>
     </message>
     <message>
         <source>There are transfers in progress. &lt;br&gt;If you close this tab, they will be canceled.&lt;br&gt;Do you want to close it anyway?</source>
         <translation>Есть незавершенные передачи. &lt;br&gt;Если вы закроете эту вкладку, они будут отменены.&lt;br&gt;Вы все равно хотите закрыть?</translation>
     </message>
     <message>
         <source>&amp;Close</source>
         <translation>&amp;Закрыть</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Close</source>
         <translation>&amp;Не закрывать</translation>
     </message>
     <message>
         <source>DCC Transfer from %1</source>
         <translation>DCC передача от %1</translation>
     </message>
     <message>
         <source>%1 is trying to send you the file %2
 (%3 bytes)</source>
         <translation>%1 пытается послать вам файл %2
 (%3 байт)</translation>
     </message>
     <message>
         <source>&amp;Accept</source>
         <translation>&amp;Принять</translation>
     </message>
     <message>
         <source>&amp;Reject</source>
         <translation>&amp;Отказаться</translation>
     </message>
 </context>
 <context>
     <name>IRCChannelTab</name>
     <message>
         <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>
         <source>Whois</source>
         <translation>Whois</translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation>Отсоединен</translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
         <translation>Подключен, вхожу ..</translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
         <translation>Вошел успешно.</translation>
     </message>
     <message>
         <source>Socket error : </source>
         <translation>Ошибка сокета : </translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation>Соединение закрыто</translation>
     </message>
 </context>
 <context>
     <name>IRCHistoryLineEdit</name>
     <message>
         <source>Next Tab</source>
         <translation>Следующая вкладка</translation>
     </message>
     <message>
         <source>Previous Tab</source>
         <translation>Предыдущая вкладка</translation>
     </message>
     <message>
         <source>Close Tab</source>
         <translation>Закрыть вкладку</translation>
     </message>
 </context>
 <context>
     <name>IRCMessageParser</name>
     <message>
         <source>Nonexistant channel join - desynchronized?</source>
         <translation>Несуществующий канал - не синхронизирован?</translation>
     </message>
     <message>
         <source>Person has already joined the channel - desynchronized?</source>
         <translation>Человек уже присоединился к каналу - не синхронизирован?</translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
         <translation>Вы уже присоединились к каналу - не синхронизирован?</translation>
     </message>
     <message>
         <source>Parting person not found - desynchronized?</source>
         <translation>Уходящий человек не найден - не синхронизирован?</translation>
     </message>
     <message>
         <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>
         <source>Mode change has unknown type</source>
         <translation>Смена режима с неизвестным типом</translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
         <translation>Смена режима для неизвестного человека - не синхронизирован?</translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
         <translation>Смена режима с неизвестным флагом</translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
         <translation>Смена режима с неизвестным каналом - не синхронизирован?</translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
         <translation>Пользовательские режимы пока не поддерживаются</translation>
     </message>
     <message>
         <source>You were kicked from </source>
         <translation>Вы были выброшены с</translation>
     </message>
     <message>
         <source> by </source>
         <translation></translation>
     </message>
     <message>
         <source> was kicked from </source>
         <translation>был выброшен с</translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
         <translation>Выброс неизестного человека - не синхронизирован?</translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
         <translation>Выброс неизвестного канала - не синхронизирован?</translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
         <translation>Сообщение сервера с неизвестным каналом</translation>
     </message>
     <message>
         <source>You joined channel </source>
         <translation>Вы присоединились к каналу</translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
         <translation>Кличка уже используется, пожалуйста пересоединитесь с другой</translation>
     </message>
     <message>
         <source>No such nickname</source>
         <translation>Нет такой клички</translation>
     </message>
     <message>
         <source>Received unhandled numeric command: %1</source>
         <translation>Принята необработанная цифровая команда: %1</translation>
     </message>
     <message>
         <source>Received unhandled ctcp command: %1</source>
         <translation>Принята необработанная ctcp команда: %1</translation>
     </message>
     <message>
         <source>Received unhandled literal command: %1</source>
         <translation>Принята необработанная буквенная команда: %1</translation>
     </message>
     <message>
         <source>%1 joined channel %2</source>
         <translation>%1 подключился к каналу %2</translation>
     </message>
     <message>
         <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>
         <source>There are %1 unknown connection(s)</source>
         <translation>%1 неизвестных соединений</translation>
     </message>
     <message>
         <source>There are %1 channels formed</source>
         <translation>%1 каналов сформировано</translation>
     </message>
     <message>
         <source>Please wait a while and try again</source>
         <translation>Пожалуйста подождите и попробуйте снова</translation>
     </message>
     <message>
         <source>Whois %1 (%2@%3)
 Real name: %4</source>
         <translation>Whois %1 (%2@%3)
 Настоящее имя: %4</translation>
     </message>
     <message>
         <source>%1 is using server %2</source>
         <translation>%1 использует сервер %2</translation>
     </message>
     <message>
         <source>%1 is on channels: %2</source>
         <translation>%1 находится на каналах: %2</translation>
     </message>
     <message>
         <source>Names for %1: %2</source>
         <translation>Имена %1: %2</translation>
     </message>
     <message>
         <source>Time on server %1 is %2</source>
         <translation>Время на сервере %1 - %2</translation>
     </message>
     <message>
         <source>Channel or nick %1 doesn&apos;t exists</source>
         <translation>Канал или ник %1 не существует</translation>
     </message>
     <message>
         <source>There is no history information for %1</source>
         <translation>Нет информации об истории %1</translation>
     </message>
     <message>
         <source>Unknown command: %1</source>
         <translation>Неизвестная команда: %1</translation>
     </message>
     <message>
         <source>Can&apos;t change nick to %1: %2</source>
         <translation>Не могу сменить ник на %1: %2</translation>
     </message>
     <message>
         <source>You&apos;re not on channel %1</source>
         <translation>Вы не находитесь на канале %1</translation>
     </message>
     <message>
         <source>[%1] Operation not permitted, you don&apos;t have enough channel privileges</source>
         <translation>[%1] Действие не разрешено, у вас недостаточно привилегий на канале</translation>
     </message>
     <message>
         <source>Connected to</source>
         <translation>Подключен к</translation>
     </message>
     <message>
         <source>%1 has been idle for %2</source>
         <translation>%1 неактивен %2</translation>
     </message>
     <message>
         <source>%1 signed on %2</source>
         <translation>%1 зарегистрировался на %2</translation>
     </message>
     <message>
         <source>CTCP PING with unknown person - Desynchronized?</source>
         <translation>CTCP PING с неизвестным человеком - десинхронизирован?</translation>
     </message>
     <message>
         <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>
         <source>Save As</source>
         <translation>Сохранить как</translation>
     </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
         <translation>Разговор с</translation>
     </message>
     <message>
         <source>Private discussion</source>
         <translation>Приватный разговор</translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
         <translation>Здесь введите свое сообщение чтобы отправить другому человеку</translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation>Отключен</translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
         <translation>Имя профиля :</translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
         <translation>Имя этого профиля сервера в в обзоре</translation>
     </message>
     <message>
         <source>Hostname :</source>
         <translation>Имя хоста :</translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
         <translation>Сервер, к которому нужно подключиться - может быть любым хостом или IP адресом</translation>
     </message>
     <message>
         <source>Port :</source>
         <translation>Порт :</translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
         <translation>Порт на сервере, к которому нужно подключиться. Обычно 6667</translation>
     </message>
     <message>
         <source>Nickname :</source>
         <translation>Ник :</translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
         <translation>Ваш ник на IRC сети</translation>
     </message>
     <message>
         <source>Realname :</source>
         <translation>Настоящее имя :</translation>
     </message>
     <message>
         <source>Your real name</source>
         <translation>Ваше настоящее имя</translation>
     </message>
     <message>
         <source>Password :</source>
         <translation>Пароль :</translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
         <translation>Пароль для соединения с сервером (если необходимо)</translation>
     </message>
     <message>
         <source>Channels :</source>
         <translation>Каналы :</translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
         <translation>Список всех каналов, через запятую, к которым вы хотите подключится автоматически</translation>
     </message>
     <message>
         <source>Edit server information</source>
         <translation>Изменить информацию о сервере</translation>
     </message>
     <message>
         <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>
         <translation>Список серверов</translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
         <translation>Пожалуйста выберите профиль сервера</translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
         <translation>Выберите профиль сервера из этого списка и нажмите OK в правом верхнем углу</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Изменить</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Добавить</translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
         <translation>Удалить выбранный профиль сервера</translation>
     </message>
     <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>
 <context>
     <name>IRCSession</name>
     <message>
         <source>You are now known as %1</source>
         <translation>Вы теперь известны как %1</translation>
     </message>
     <message>
         <source>Nickname change of an unknown person</source>
         <translation>Смена ника неизвестного человека</translation>
     </message>
     <message>
         <source>%1 is now known as %2</source>
         <translation>%1 теперь известен как %2</translation>
     </message>
 </context>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Lines displayed :</source>
         <translation>Число отображаемых строк :</translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
         <translation>Число отображаемых строк в чатах прежде чем они удаляются - это необходимо чтобы ограничить расход памяти. Установите на 0 если вам это не нужно</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Общие</translation>
     </message>
     <message>
         <source>Background color :</source>
         <translation>Цвет фона :</translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
         <translation>Цвет фона, используемый в чатах</translation>
     </message>
     <message>
         <source>Normal text color :</source>
         <translation>Цвет обычного текста :</translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
         <translation>Цвет текста, используемого в чатах</translation>
     </message>
     <message>
         <source>Error color :</source>
         <translation>Цвет ошибок :</translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
         <translation>Цвет текста, используемого для отображения ошибок</translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
         <translation>Текст, написанный вами :</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
         <translation>Цвет текста, используемого чтобы видеть текст написанный вами</translation>
     </message>
     <message>
         <source>Text written by others :</source>
         <translation>Текст, написанный другими :</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
         <translation>Цвет текста, используемого чтобы видеть текст написанный другими</translation>
     </message>
     <message>
         <source>Text written by the server :</source>
         <translation>Текст, написанный сервером :</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
         <translation>Цвет текста, используемого чтобы видеть текст написанный сервером</translation>
     </message>
     <message>
         <source>Notifications :</source>
         <translation>Уведомления :</translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
         <translation>Цвет текста, используемого для отображения уведомлений</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Цвета</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Настройки</translation>
     </message>
     <message>
         <source>Display time in chat log</source>
         <translation>Показывать время в журнале чата</translation>
     </message>
     <message>
         <source>Keyboard Shortcuts</source>
         <translation>Клавиатурные команды</translation>
     </message>
 </context>
 <context>
     <name>IRCTab</name>
     <message>
         <source>Missing description</source>
         <translation>Нету описания</translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
         <translation>Описание содержания этой вкладки</translation>
     </message>
     <message>
         <source>Close this tab</source>
         <translation>Закрыть эту вкладку</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
         <translation>IRC Клиент</translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
         <translation>Соединения с серверами, каналами, запросы и прочие вещи будут здесь</translation>
     </message>
     <message>
         <source>IRC</source>
         <translation>IRC</translation>
     </message>
     <message>
         <source>New connection</source>
         <translation>Новое соединение</translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
         <translation>Создать новое соединение с IRC сервером</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Настройки</translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
         <translation>Настроить поведение и внешний вид OpieIRC</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source> User</source>
         <translation>Пользователь</translation>
     </message>
     <message>
         <source>Opie IRC</source>
         <translation>Opie IRC</translation>
     </message>
     <message>
         <source> gives channel operator status to </source>
         <translation>дает статус оператора канала</translation>
     </message>
     <message>
         <source> removes channel operator status from </source>
         <translation>забирает статус оператора канала у</translation>
     </message>
     <message>
         <source> gives voice to </source>
         <translation>дает голос</translation>
     </message>
     <message>
         <source> removes voice from </source>
         <translation>забирает голос у</translation>
     </message>
 </context>
 </TS>
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
@@ -1,843 +1,880 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AccountView</name>
     <message>
         <source>Error creating new Folder</source>
         <translation>Ошибка создания новой папки</translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation>&lt;center&gt;Ошибка во время создания&lt;br&gt;новой папки - останавливаю.&lt;/center&gt;</translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation>В адресной книге нет записей.</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Вы должны выбрать хотя бы один адрес.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Да</translation>
     </message>
 </context>
 <context>
     <name>AddressPickerUI</name>
     <message>
         <source>Address Picker</source>
         <translation>Выбор адреса</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Да</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
 </context>
 <context>
     <name>ComposeMail</name>
     <message>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Размер</translation>
     </message>
     <message>
         <source>Problem</source>
         <translation>Проблема</translation>
     </message>
     <message>
         <source>&lt;p&gt;Please create an SMTP account first.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Пожалуйста сначала создайте SMTP запись.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Да</translation>
     </message>
     <message>
         <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>
         <source>No</source>
         <translation>Нет</translation>
     </message>
     <message>
         <source>&lt;center&gt;Attachments will not be stored in &quot;Draft&quot; folder&lt;/center&gt;</source>
         <translation>&lt;center&gt;Вложение не будут сохранены в папке &quot;Черновики&quot;&lt;/center&gt;</translation>
     </message>
     <message>
         <source>No Receiver specified</source>
         <translation>Не задан получатель</translation>
     </message>
 </context>
 <context>
     <name>ComposeMailUI</name>
     <message>
         <source>Compose Message</source>
         <translation>Написать письмо</translation>
     </message>
     <message>
         <source>send later</source>
         <translation>отправить позже</translation>
     </message>
     <message>
         <source>use:</source>
         <translation>использовать:</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Почта</translation>
     </message>
     <message>
         <source>Subject</source>
         <translation>Тема</translation>
     </message>
     <message>
         <source>From</source>
         <translation>От</translation>
     </message>
     <message>
         <source>To</source>
         <translation>Кому</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Опции</translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation>Обр. адрес</translation>
     </message>
     <message>
         <source>BCC</source>
         <translation>BCC</translation>
     </message>
     <message>
         <source>Signature</source>
         <translation>Подпись</translation>
     </message>
     <message>
         <source>CC</source>
         <translation>CC</translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation>Вложение</translation>
     </message>
     <message>
         <source>Delete File</source>
         <translation>Удалить файл</translation>
     </message>
     <message>
         <source>Add File</source>
         <translation>Добавить файл</translation>
     </message>
 </context>
 <context>
     <name>EditAccounts</name>
     <message>
         <source>Account</source>
         <translation>Учетная запись</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
         <source>Question</source>
         <translation>Вопрос</translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete the selected Account?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Вы действительно хотите удалить выбранную учетную запись?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Да</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Нет</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select an account.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Пожалуйста выберите учетную запись.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Да</translation>
     </message>
 </context>
 <context>
     <name>EditAccountsUI</name>
     <message>
         <source>Configure Accounts</source>
         <translation>Настроить учетные записи</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Почта</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Новый</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Имя учетной записи</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Правка</translation>
     </message>
     <message>
         <source>News</source>
         <translation>Новости</translation>
     </message>
 </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>
         <source>Name of the Account</source>
         <translation>Имя учетной записи</translation>
     </message>
     <message>
         <source>Account</source>
         <translation>Учетная запись</translation>
     </message>
     <message>
         <source>Prefix</source>
         <translation>Префикс</translation>
     </message>
     <message>
         <source>ssh $SERVER exec</source>
         <translation>ssh $SERVER exec</translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation>Использовать защищенные сокеты:</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Mail</source>
         <translation>Почта</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Настройки</translation>
     </message>
     <message>
         <source>Compose new mail</source>
         <translation>Создать новое сообщение</translation>
     </message>
     <message>
         <source>Send queued mails</source>
         <translation>Отослать письма из очереди</translation>
     </message>
     <message>
         <source>Show/Hide folders</source>
         <translation>Показать/скрыть папки</translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation>Удалить сообщение</translation>
     </message>
     <message>
         <source>Edit settings</source>
         <translation>Изменить настройки</translation>
     </message>
     <message>
         <source>Configure accounts</source>
         <translation>Настроить учетные записи</translation>
     </message>
     <message>
         <source>Mailbox</source>
         <translation>Почтовый ящик</translation>
     </message>
     <message>
         <source>Subject</source>
         <translation>Тема</translation>
     </message>
     <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>
         <translation>список групп новостей</translation>
     </message>
     <message>
         <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>Введите строку фильтра.
 Потом нажмите &quot;получить список групп новостей&quot; снова, и только группы,
 начинающиеся с этой строки, будут показаны.</translation>
     </message>
 </context>
 <context>
     <name>NNTPconfigUI</name>
     <message>
         <source>Configure NNTP</source>
         <translation>Настроить NNTP</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Порт</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Имя учетной записи</translation>
     </message>
     <message>
         <source>Account</source>
         <translation>Учетная запись</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Сервер</translation>
     </message>
     <message>
         <source>Use SSL</source>
         <translation>Исп. SSL</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Пользователь</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Пароль</translation>
     </message>
     <message>
         <source>Use Login</source>
         <translation>Исп. регистрацию</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Группы</translation>
     </message>
     <message>
         <source>Newsgroup</source>
         <translation>Группы новостей</translation>
     </message>
     <message>
         <source>Get newsgroup list from server</source>
         <translation>Получить список групп новостей с сервера</translation>
     </message>
 </context>
 <context>
     <name>Newmdirdlgui</name>
     <message>
         <source>Enter directory name</source>
         <translation>Введите имя папки</translation>
     </message>
     <message>
         <source>Directory name:</source>
         <translation>Имя папки:</translation>
     </message>
     <message>
         <source>Directory contains other subdirs</source>
         <translation>Папка содержит другие подпапки</translation>
     </message>
 </context>
 <context>
     <name>OpieMail</name>
     <message>
         <source>Info</source>
         <translation>Информация</translation>
     </message>
     <message>
         <source>Mail queue flushed</source>
         <translation>Вся очередь писем отправлена</translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation>Удалить сообщение</translation>
     </message>
     <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>Read this mail</source>
         <translation>Прочитать это сообщение</translation>
     </message>
     <message>
         <source>Delete this mail</source>
         <translation>Удалить это сообщение</translation>
     </message>
     <message>
         <source>Copy/Move this mail</source>
         <translation>Скопировать/переместить это сообщение</translation>
     </message>
     <message>
         <source>Error creating new Folder</source>
         <translation>Ошибка создания новой папки</translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation>&lt;center&gt;Ошибка во время создания&lt;br&gt;новой папки - останавливаю.&lt;/center&gt;</translation>
     </message>
     <message>
         <source>Define a smtp account first</source>
         <translation>Сначала укажите учетную запись SMTP</translation>
     </message>
     <message>
         <source>Read this posting</source>
         <translation>Прочитать этот пост</translation>
     </message>
     <message>
         <source>Edit this mail</source>
         <translation>Правка этого сообщения</translation>
     </message>
 </context>
 <context>
     <name>POP3configUI</name>
     <message>
         <source>Configure POP3</source>
         <translation>Настроить POP3</translation>
     </message>
     <message>
         <source>Account</source>
         <translation>Учетная запись</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Имя учетной записи</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Сервер</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Порт</translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation>Использовать защищенные сокеты:</translation>
     </message>
     <message>
         <source>ssh $SERVER exec imapd</source>
         <translation>ssh $SERVER exec imapd</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Пользователь</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Пароль</translation>
     </message>
     <message>
         <source>ask before downloading large mails</source>
         <translation>спрашивать перед загрузкой больших сообщений</translation>
     </message>
     <message>
         <source>Large mail size (kb):</source>
         <translation>Большой размер (кбайт):</translation>
     </message>
     <message>
         <source> kB</source>
         <translation>кбайт</translation>
     </message>
 </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>
         <source>Password</source>
         <translation>Пароль</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Порт</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Сервер</translation>
     </message>
     <message>
         <source>Port of the SMTP Server</source>
         <translation>Порт SMTP сервера</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Пользователь</translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation>Использовать защищенные сокеты:</translation>
     </message>
     <message>
         <source>ssh $SERVER exec</source>
         <translation>ssh $SERVER exec</translation>
     </message>
 </context>
 <context>
     <name>SelectMailTypeUI</name>
     <message>
         <source>Select Type</source>
         <translation>Выберите тип</translation>
     </message>
     <message>
         <source>Select Account Type</source>
         <translation>Выберите тип учетной записи</translation>
     </message>
     <message>
         <source>IMAP</source>
         <translation>IMAP</translation>
     </message>
     <message>
         <source>POP3</source>
         <translation>POP3</translation>
     </message>
     <message>
         <source>SMTP</source>
         <translation>SMTP</translation>
     </message>
 </context>
 <context>
     <name>SettingsDialogUI</name>
     <message>
         <source>Settings Dialog</source>
         <translation>Диалог настроек</translation>
     </message>
     <message>
         <source>View Mail</source>
         <translation>Просмотреть почту</translation>
     </message>
     <message>
         <source>View mail as Html</source>
         <translation>Просмотреть почту как HTML</translation>
     </message>
     <message>
         <source>Compose Mail</source>
         <translation>Создать сообщение</translation>
     </message>
     <message>
         <source>Send mails later ( enqueue in outbox )</source>
         <translation>Отправить почту позже ( очередь в папке &quot;исходящие&quot; )</translation>
     </message>
     <message>
         <source>Taskbar Applet</source>
         <translation>Апплет на панели</translation>
     </message>
     <message>
         <source>Disable Taskbar Applet</source>
         <translation>Запретить апплет на панели</translation>
     </message>
     <message>
         <source> min</source>
         <translation>мин</translation>
     </message>
     <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>
     <message>
         <source>From</source>
         <translation>От</translation>
     </message>
     <message>
         <source>To</source>
         <translation>Кому</translation>
     </message>
     <message>
         <source>Cc</source>
         <translation>Cc</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot reply yet.</source>
         <translation>&lt;p&gt;Тело сообщения еще не скачано, так что вы еще не можете ответить.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Да</translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot forward yet.</source>
         <translation>&lt;p&gt;Тело сообщения еще не скачано, так что вы еще не можете переслать.</translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation>Удалить сообщение</translation>
     </message>
     <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>
         <source>Attachments</source>
         <translation>Вложения</translation>
     </message>
     <message>
         <source>Show Html</source>
         <translation>Показать HTML</translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation>Удалить сообщение</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Описание</translation>
     </message>
     <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>
         <translation>Выберите целевой ящик</translation>
     </message>
     <message>
         <source>&lt;b&gt;Store mail(s) to&lt;/b&gt;</source>
         <translation>&lt;b&gt;Хранить почту в&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Folder:</source>
         <translation>Папка:</translation>
     </message>
     <message>
         <source>Account:</source>
         <translation>Учетная запись:</translation>
     </message>
     <message>
         <source>Create new folder</source>
         <translation>Создать новую папку</translation>
     </message>
     <message>
         <source>Prefix will prepend, no need to enter it!</source>
         <translation>Префикс будет добавлен, не нужно его вводить!</translation>
     </message>
     <message>
         <source>Move mail(s)</source>
         <translation>Переместить почту</translation>
     </message>
 </context>
 </TS>
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
@@ -1,196 +1,154 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HelpWindow</name>
     <message>
         <source>Backward</source>
         <translation>Назад</translation>
     </message>
     <message>
         <source>Forward</source>
         <translation>Вперед</translation>
     </message>
 </context>
 <context>
     <name>QtRec</name>
     <message>
         <source>OpieRecord </source>
         <translation>OpieЗапись</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Время</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>Файлы</translation>
     </message>
     <message>
         <source>Sample Rate</source>
         <translation>Частота дискретизации</translation>
     </message>
     <message>
         <source>Limit Size</source>
         <translation>Ограничить размер</translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation>Неограниченный</translation>
     </message>
     <message>
         <source>File Directory</source>
         <translation>Каталог для файлов</translation>
     </message>
     <message>
         <source>Bit Depth</source>
         <translation>Битность</translation>
     </message>
     <message>
         <source>In</source>
         <translation>Вход</translation>
     </message>
     <message>
         <source>Out</source>
         <translation>Выход</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Опции</translation>
     </message>
     <message>
         <source>Volume</source>
         <translation>Громкость</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <source>Send with Ir</source>
         <translation>Отправить через ИК</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Переименовать</translation>
     </message>
     <message>
         <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>
 </TS>
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
@@ -1,151 +1,131 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <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>
         <source>Options</source>
         <translation>Параметры</translation>
     </message>
     <message>
         <source>Enter your search terms here</source>
         <translation>Задайте условия поиска здесь</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Приложения</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Документы</translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation>Задачи</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Календарь</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Контакты</translation>
     </message>
     <message>
         <source>Search for: </source>
         <translation>Искать:</translation>
     </message>
     <message>
         <source></source>
         <translation></translation>
     </message>
     <message>
         <source>Case sensitive</source>
         <translation>Учет регистра</translation>
     </message>
 </context>
 <context>
     <name>OListView</name>
     <message>
         <source>Results</source>
         <translation>Результаты</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>show</source>
         <translation>показать</translation>
     </message>
     <message>
         <source>edit</source>
         <translation>изменить</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>выполнить</translation>
     </message>
     <message>
         <source>open in filemanager</source>
         <translation>открыть в менеджере файлов</translation>
     </message>
     <message>
         <source>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>
         <source>Search in dates</source>
         <translation>Искать в датах</translation>
     </message>
     <message>
         <source>Search content</source>
         <translation>Искать содержимое</translation>
     </message>
 </context>
 </TS>
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
@@ -1,451 +1,439 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CalcDlg</name>
     <message>
         <source>Calculate</source>
         <translation>Вычислить</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>Очистить</translation>
     </message>
     <message>
         <source>Molecular Weight</source>
         <translation>Молекулярный вес</translation>
     </message>
     <message>
         <source>Chemical Formula</source>
         <translation>Химическая формула</translation>
     </message>
     <message>
         <source>Molecular Weight (u):</source>
         <translation>Молекулярный вес (u):</translation>
     </message>
     <message>
         <source>Elemental Composition (%):</source>
         <translation>Состав элементов (%):</translation>
     </message>
     <message>
         <source>CalcDlg</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OxydataWidget</name>
     <message>
         <source>Block</source>
         <translation>Блок</translation>
     </message>
     <message>
         <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>
         <source>%1 pm</source>
         <translation>%1 пм</translation>
     </message>
     <message>
         <source>%1 g/cm^3</source>
         <translation>%1 г/см^3</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation>Вес</translation>
     </message>
     <message>
         <source>Ionization Energy</source>
         <translation>Энергия ионизации</translation>
     </message>
     <message>
         <source>Boiling point</source>
         <translation>Точка кипения</translation>
     </message>
     <message>
         <source>Melting point</source>
         <translation>Точка плавления</translation>
     </message>
 </context>
 <context>
     <name>Oxygen</name>
     <message>
         <source>Oxygen</source>
         <translation>Кислород</translation>
     </message>
     <message>
         <source>PSE</source>
         <translation>Таблица</translation>
     </message>
     <message>
         <source>Data</source>
         <translation>Данные</translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation>Вычисления</translation>
     </message>
     <message>
         <source>Hydrogen</source>
         <translation>Водород</translation>
     </message>
     <message>
         <source>Helium</source>
         <translation>Гелий</translation>
     </message>
     <message>
         <source>Lithium</source>
         <translation>Литий</translation>
     </message>
     <message>
         <source>Beryllium</source>
         <translation>Бериллий</translation>
     </message>
     <message>
         <source>Boron</source>
         <translation>Бор</translation>
     </message>
     <message>
         <source>Carbon</source>
         <translation>Углерод</translation>
     </message>
     <message>
         <source>Nitrogen</source>
         <translation>Азот</translation>
     </message>
     <message>
         <source>Fluorine</source>
         <translation>Фтор</translation>
     </message>
     <message>
         <source>Neon</source>
         <translation>Неон</translation>
     </message>
     <message>
         <source>Sodium</source>
         <translation>Натрий</translation>
     </message>
     <message>
         <source>Magnesium</source>
         <translation>Магний</translation>
     </message>
     <message>
         <source>Aluminum</source>
         <translation>Алюминий</translation>
     </message>
     <message>
         <source>Silicon</source>
         <translation>Силикон</translation>
     </message>
     <message>
         <source>Phosphorus</source>
         <translation>Фосфор</translation>
     </message>
     <message>
         <source>Sulfur</source>
         <translation>Сера</translation>
     </message>
     <message>
         <source>Chlorine</source>
         <translation>Хлор</translation>
     </message>
     <message>
         <source>Argon</source>
         <translation>Аргон</translation>
     </message>
     <message>
         <source>Potassium</source>
         <translation>Калий</translation>
     </message>
     <message>
         <source>Calcium</source>
         <translation>Кальций</translation>
     </message>
     <message>
         <source>Scandium</source>
         <translation>Скандий</translation>
     </message>
     <message>
         <source>Titanium</source>
         <translation>Титаний</translation>
     </message>
     <message>
         <source>Vanadium</source>
         <translation>Ванадий</translation>
     </message>
     <message>
         <source>Chromium</source>
         <translation>Хром</translation>
     </message>
     <message>
         <source>Manganese</source>
         <translation>Марганец</translation>
     </message>
     <message>
         <source>Iron</source>
         <translation>Железо</translation>
     </message>
     <message>
         <source>Cobalt</source>
         <translation>Кобальт</translation>
     </message>
     <message>
         <source>Nickel</source>
         <translation>Никель</translation>
     </message>
     <message>
         <source>Copper</source>
         <translation>Медь</translation>
     </message>
     <message>
         <source>Zinc</source>
         <translation>Цинк</translation>
     </message>
     <message>
         <source>Gallium</source>
         <translation>Галлий</translation>
     </message>
     <message>
         <source>Germanium</source>
         <translation>Германий</translation>
     </message>
     <message>
         <source>Arsenic</source>
         <translation>Мышьяк</translation>
     </message>
     <message>
         <source>Selenium</source>
         <translation>Селений</translation>
     </message>
     <message>
         <source>Bromine</source>
         <translation>Бром</translation>
     </message>
     <message>
         <source>Krypton</source>
         <translation>Криптон</translation>
     </message>
     <message>
         <source>Rubidium</source>
         <translation>Рубидий</translation>
     </message>
     <message>
         <source>Strontium</source>
         <translation>Стронций</translation>
     </message>
     <message>
         <source>Yttrium</source>
         <translation>Иттрий</translation>
     </message>
     <message>
         <source>Zirconium</source>
         <translation>Цирконий</translation>
     </message>
     <message>
         <source>Niobium</source>
         <translation>Ниобий</translation>
     </message>
     <message>
         <source>Molybdenum</source>
         <translation>Молибден</translation>
     </message>
     <message>
         <source>Technetium</source>
         <translation>Технеций</translation>
     </message>
     <message>
         <source>Ruthenium</source>
         <translation>Рутений</translation>
     </message>
     <message>
         <source>Rhodium</source>
         <translation>Родий</translation>
     </message>
     <message>
         <source>Palladium</source>
         <translation>Палладий</translation>
     </message>
     <message>
         <source>Silver</source>
         <translation>Серебро</translation>
     </message>
     <message>
         <source>Cadmium</source>
         <translation>Кадмий</translation>
     </message>
     <message>
         <source>Indium</source>
         <translation>Индий</translation>
     </message>
     <message>
         <source>Tin</source>
         <translation>Олово</translation>
     </message>
     <message>
         <source>Antimony</source>
         <translation>Сурьма</translation>
     </message>
     <message>
         <source>Tellurium</source>
         <translation>Теллурий</translation>
     </message>
     <message>
         <source>Iodine</source>
         <translation>Йод</translation>
     </message>
     <message>
         <source>Xenon</source>
         <translation>Ксенон</translation>
     </message>
     <message>
         <source>Cesium</source>
         <translation>Цезий</translation>
     </message>
     <message>
         <source>Barium</source>
         <translation>Барий</translation>
     </message>
     <message>
         <source>Lanthanum</source>
         <translation>Лантан</translation>
     </message>
     <message>
         <source>Cerium</source>
         <translation>Церий</translation>
     </message>
     <message>
         <source>Praseodymium</source>
         <translation>Празеодим</translation>
     </message>
     <message>
         <source>Neodymium</source>
         <translation>Неодим</translation>
     </message>
     <message>
         <source>Promethium</source>
         <translation>Прометий</translation>
     </message>
     <message>
         <source>Samarium</source>
         <translation>Самарий</translation>
     </message>
     <message>
         <source>Europium</source>
         <translation>Европий</translation>
     </message>
     <message>
         <source>Gadolinium</source>
         <translation>Гадолиний</translation>
     </message>
     <message>
         <source>Terbium</source>
         <translation>Тербий</translation>
     </message>
     <message>
         <source>Dysprosium</source>
         <translation>Диспрозий</translation>
     </message>
     <message>
         <source>Holmium</source>
         <translation>Гольмий</translation>
     </message>
     <message>
         <source>Erbium</source>
         <translation>Эрбий</translation>
     </message>
     <message>
         <source>Thulium</source>
         <translation>Тулий</translation>
     </message>
     <message>
         <source>Ytterbium</source>
         <translation>Иттербий</translation>
     </message>
     <message>
         <source>Lutetium</source>
         <translation>Лютеций</translation>
     </message>
     <message>
         <source>Hafnium</source>
         <translation>Гафний</translation>
     </message>
     <message>
         <source>Tantalum</source>
         <translation>Тантал</translation>
     </message>
     <message>
         <source>Tungsten</source>
         <translation>Вольфрам</translation>
     </message>
     <message>
         <source>Rhenium</source>
         <translation>Рений</translation>
     </message>
     <message>
         <source>Osmium</source>
         <translation>Осмий</translation>
     </message>
     <message>
         <source>Iridium</source>
         <translation>Иридий</translation>
     </message>
     <message>
         <source>Platinum</source>
         <translation>Платина</translation>
     </message>
     <message>
         <source>Gold</source>
         <translation>Золото</translation>
     </message>
     <message>
         <source>Mercury</source>
         <translation>Ртуть</translation>
     </message>
     <message>
         <source>Thallium</source>
         <translation>Таллий</translation>
     </message>
     <message>
         <source>Lead</source>
         <translation>Свинец</translation>
     </message>
     <message>
         <source>Bismuth</source>
         <translation>Висмут</translation>
     </message>
     <message>
         <source>Polonium</source>
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
@@ -1,452 +1,417 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation>Язык</translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation>Время и Дата</translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation>Персональная Информация</translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation>ДокВкладка</translation>
     </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation>Проблема</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation>&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>&lt;p&gt;Вы хотите прервать работу программы?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;p&gt;Быстрая загрузка запрещена для этой программы. Нажмите и удерживайте иконку программы, чтобы разрешить ее.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; прервано сигналом %2&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation>Программа прервана</translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation>Программа не найдена</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Не могу найти программу &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Не могу найти программу %1&lt;/qt&gt;</translation>
     </message>
     <message>
         <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>
 <context>
     <name>FirstUse</name>
     <message>
         <source>&lt;&lt; Back</source>
         <translation>&lt;&lt; Предыд.</translation>
     </message>
     <message>
         <source>Next &gt;&gt;</source>
         <translation>След. &gt;&gt;</translation>
     </message>
     <message>
         <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>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation>Запуск</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation>- Запуск</translation>
     </message>
     <message>
         <source>No application</source>
         <translation>Нет программы</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; Нет заданной программы для документа.&lt;p&gt; Тип %1.</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Документы</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Ок</translation>
     </message>
     <message>
         <source>View as text</source>
         <translation>Просмотреть как текст</translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation>&lt;b&gt;Поиск Документов...&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation>Пиктограммы</translation>
     </message>
     <message>
         <source>List View</source>
         <translation>Список</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;Вкладка Документы&lt;p&gt;запрещена.&lt;p&gt;Загляните в Настройки-&gt;Запуск-&gt;ДокВкладка&lt;p&gt;чтобы снова разрешить ее.&lt;/b&gt;&lt;/center&gt;</translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>Document View</source>
         <translation>Просмотр</translation>
     </message>
     <message>
         <source>All types</source>
         <translation>Все типы</translation>
     </message>
 </context>
 <context>
     <name>Mediadlg</name>
     <message>
         <source>A new storage media detected:</source>
         <translation>Обнаружено новое устройство:</translation>
     </message>
     <message>
         <source>What should I do with it?</source>
         <translation>Что мне с ним делать?</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>Настроить это устройство. Изменения будут применены после завершения приложения. Чтобы обновить вкладку &quot;Документы&quot;, необходимо выдвинуть и снова вставить это устройство.</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation>Какие типы файлов</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Аудио</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Все</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Изображения</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Текст</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>Видео</translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation>Ограничить поиск:</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Добавить</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Убрать</translation>
     </message>
     <message>
         <source>Scan whole media</source>
         <translation>Просканировать все устройство</translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation>Всегда проверять это устройство</translation>
     </message>
 </context>
 <context>
     <name>QueuedRequestRunner</name>
     <message>
         <source>Processing Queued Requests</source>
         <translation>Обрабатываю запросы в очереди</translation>
     </message>
 </context>
 <context>
     <name>SafeMode</name>
     <message>
         <source>Safe Mode</source>
         <translation>Безопасный режим</translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation>Управление плагинами...</translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation>Перезагрузить Otopia</translation>
     </message>
     <message>
         <source>Help...</source>
         <translation>Помощь...</translation>
     </message>
 </context>
 <context>
     <name>Server</name>
     <message>
         <source>USB Lock</source>
         <translation>USB замок</translation>
     </message>
 </context>
 <context>
     <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>
         <source>OK</source>
         <translation>ОК</translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation>Управление Плагинами...</translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation>Статус памяти</translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation>Нехватка памяти.
 Сохраните данные!</translation>
     </message>
     <message>
         <source>Critical Memory Shortage
 Please end this application
 immediately.</source>
         <translation>Критическая нехватка памяти.
 Немедленно завершите программу.</translation>
     </message>
     <message>
         <source>WARNING</source>
         <translation>ВНИМАНИЕ</translation>
     </message>
     <message>
         <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
         <translation>&lt;p&gt;Критический уровень заряда аккумулятора!&lt;p&gt;Отключите устройство до тех пор пока оно не будет подключено к внешнему источнику</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Да</translation>
     </message>
     <message>
         <source>The battery is running very low. </source>
         <translation>Аккумулятор разряжен.</translation>
     </message>
     <message>
         <source>&lt;p&gt;The Back-up battery is very low&lt;p&gt;Please charge the back-up battery</source>
         <translation>&lt;p&gt;Запасной аккумулятор разряжен.&lt;p&gt;Пожалуйста зарядите его</translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation>Завершить сеанс</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation>Выйти из Opie</translation>
     </message>
     <message>
         <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>
         <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;Неавторизованная система требует доступа к устройству.&lt;p&gt;Вы выбрали IntelliSync так что вы можете разрешить или запретить это соединение.&lt;/qt&gt;</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;Неавторизованная система требует доступа к устройству.&lt;p&gt;Если у Вас Qtopia Desktop 1.5.1 и меньше, пожалуйста обновите или изменитье настройки под IntelliSync.</translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Abort</source>
         <translation>Прервать</translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation>Синхронизация:</translation>
     </message>
 </context>
 </TS>
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
@@ -1,588 +1,266 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoginBase</name>
     <message>
         <source>LoginBase</source>
         <translation>ЛогинБаза</translation>
     </message>
     <message>
         <source>Login</source>
         <translation>Войти</translation>
     </message>
     <message>
         <source>Login Automatically</source>
         <translation>Входить автоматически</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>Если вы выберите эту опцию, 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>Этот список позволит выбрать пользователя для авто-входа
 (если разрешен).  
 
 Вы можете выбрать только уже настроенное имя пользователя.</translation>
     </message>
 </context>
 <context>
     <name>MultiauthConfig</name>
     <message>
         <source>Security configuration</source>
         <translation>Настройки безопасности</translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>Загрузить плагины в следующем порядке:</translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the order they will appear in</source>
         <translation>Поставьте флажок чтобы активировать плагин или используйте стрелки справа чтобы изменить порядок, в котором они будут показаны</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>Выше</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>Ниже</translation>
     </message>
     <message>
         <source>plugins</source>
         <translation>плагины</translation>
     </message>
     <message>
         <source>Authentication</source>
         <translation>Аутентификация</translation>
     </message>
     <message>
         <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>
         <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-securityplugin-*&lt;/em&gt; package! Once you have done that, you will be able to configure your PDA protection here.</source>
         <translation>Чтобы защитить ваш КПК одним или более плагином аутентификации (например, простой ввод ПИН), вы должны установить хотя бы один &lt;em&gt;opie-securityplugin-*&lt;/em&gt; пакет! Как только вы это сделаете, здесь вы сможете настроить защиту вашего КПК.</translation>
     </message>
 </context>
 <context>
     <name>MultiauthGeneralConfig</name>
     <message>
         <source>When to lock Opie</source>
         <translation>Когда заблокировать Opie</translation>
     </message>
     <message>
         <source>on Opie start</source>
         <translation>при запуске Opie</translation>
     </message>
     <message>
         <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>
         <source>Attention</source>
         <translation>Внимание</translation>
     </message>
     <message>
         <source>You must save your current settings before trying to authenticate. Press OK to accept and launch a simulated authentication process.</source>
         <translation>Сначала вы должны сохранить текущие настройки. Нажмите &quot;Да&quot;, чтобы принять и запустить демонстрацию процесса аутентификации.</translation>
     </message>
     <message>
         <source>If you don&apos;t like the result of this test, don&apos;t forget to change your settings before you exit the configuration application!</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>
     </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>Выберите или введите новый участок сети.  
 
 Этот список позволяет выбрать участок сети из которого можно подключится к вашему КПК.  
 
 Например, участок сети 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>Удалить запись</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>Удалить выбранный участок из списка
 
 Если вы нажмете эту кнопку, выбранный участок будет удален из списка.
 
 Если вы нажали эту кнопку случайно, кнопка &quot;По умолчанию&quot;
 восстановит список в том виде, когда вы первый раз запустили ваш КПК.</translation>
     </message>
     <message>
         <source>Restore Defaults</source>
         <translation>По умолчанию</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>Эта кнопка восстановит список участков сети
 по умолчанию.
 
 Учтите что вручную введенные участки будут потеряны!</translation>
     </message>
     <message>
         <source>Select your sync software</source>
         <translation>Выберите программу</translation>
     </message>
     <message>
         <source>Qtopia 1.7</source>
         <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.
 <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
@@ -1,404 +1,364 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation>Эта вкладка показывает доступные тесты, их результаты, и данные для сравнения их с выбранным устройством. Отметьте галочки напротив тестов, которые вы хотите провести.</translation>
     </message>
     <message>
         <source>Tests</source>
         <translation>Тесты</translation>
     </message>
     <message>
         <source>Results</source>
         <translation>Результаты</translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation>Сравнение</translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation>1. Целые числа  </translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation>2. Сопроцессор  </translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation>3. Вывод текста  </translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation>4. Вывод графики  </translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation>5. Производительность ОЗУ  </translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation>6. Производительность SD карты  </translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation>7. Производительность CF карты  </translation>
     </message>
     <message>
         <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>
         <source>Ha</source>
         <translation>Ha</translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation>График показывает использование места на жестком диске.</translation>
     </message>
     <message>
         <source>SD</source>
         <translation>SD</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation>График показывает использование памяти на SD-карте.</translation>
     </message>
     <message>
         <source>SC</source>
         <translation>SC</translation>
     </message>
     <message>
         <source>In</source>
         <translation>В</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation>График показывает использование встроенной памяти (флэш-памяти) данного устройства.</translation>
     </message>
     <message>
         <source>RA</source>
         <translation>RA</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation>График показывает использование виртуального диска.</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Процессор ( программы ),%</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>Процессор ( система ), %</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Тип:</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Страница отображает использование процессора.</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Используется (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Буфер (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Кэш (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Свободно (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Всего памяти: %1 kB</translation>
     </message>
     <message>
-        <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
-Memory is categorized as follows:
-
-1. Used - memory used to by Opie and any running applications.
-2. Buffers - temporary storage used to improve performance
-3. Cached - information that has recently been used, but has not been freed yet.
-4. Free - memory not currently used by Opie or any running applications.</source>
-        <translation 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. Буфера - временное хранение для увеличения производительности.
 3. Кэш - информация которая была недавно использована, но еще не освобождена.
 4. Свободная - память не используемая Opie или открытыми приложениями.</translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation>Подкачки: %1 кбайт</translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Модуль</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Размер</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Исп.#</translation>
     </message>
     <message>
         <source>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>Выберите команду и щелкните &quot;Послать&quot;, чтобы послать команду выбранному модулю.</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>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>
     <message>
         <source>Available (%1 kB)</source>
         <translation>Доступно (%1 кбайт)</translation>
     </message>
     <message>
         <source> : %1 kB</source>
         <translation>: %1 кбайт</translation>
     </message>
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Команда</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Статус</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Время</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation>Список выполняющихся процессов.
 Нажмите и удерживайте процесс, чтобы получить добавочную информацию или послать ему сигнал.</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation>Выберите сигнал и нажмите &quot;Послать&quot;.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Послать</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation>Щелкните, чтобы послать сигнал этому процессу.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>Детальная информация о данном процессе.</translation>
     </message>
     <message>
-        <source>You really want to send %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>
     <message>
         <source>Memory</source>
         <translation>Память</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Диск</translation>
     </message>
     <message>
         <source>CPU</source>
         <translation>Процессор</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Процессы</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Версия</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>Модули</translation>
     </message>
     <message>
         <source>Benchmark</source>
         <translation>Бенчмарки</translation>
     </message>
     <message>
         <source>Syslog</source>
         <translation>Системный журнал</translation>
     </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Ядро&lt;/b&gt;&lt;p&gt;Версия:</translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Сборка:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;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>
         <source>Built against Qt/E </source>
         <translation>Собрано для Qt/E </translation>
     </message>
 </context>
 </TS>
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,69 +1,58 @@
 <!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>
     <message>
         <source>TableViewer - Edit Keys</source>
         <translation>ПросмотрТаблиц - Правка ключей</translation>
     </message>
     <message>
         <source>Key Name</source>
         <translation>Имя ключа</translation>
     </message>
     <message>
         <source>Key Type</source>
         <translation>Тип ключа</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Новый</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
         <source>Clear All</source>
         <translation>Очистить все</translation>
     </message>
 </context>
 <context>
     <name>TVListView</name>
     <message>
         <source>List View</source>
         <translation>Списком</translation>
     </message>
 </context>
 <context>
     <name>TableViewerWindow</name>
     <message>
         <source>Table Viewer</source>
         <translation>Просмотр Таблиц</translation>
     </message>
     <message>
         <source>could not load Document</source>
         <translation>не смог открыть документ</translation>
     </message>
 </context>
 </TS>
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,146 +1,142 @@
 <!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>
         <source>Today Error</source>
         <translation>Ошибка Сегодня</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;Плагин &apos;%1&apos; вызвал обрушение программы Сегодня. Возможно, что плагин неправильно установлен.&lt;br&gt;Сегодня попробует продолжить загрузку плагинов.&lt;/qt&gt;</translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation>Сегодня</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
         <translation>Сегодня by Maximilian Reiß</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>Щелкните для диалога конфигурации</translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>Загрузить с плагинами в порядке:</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>Вверх</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>Вниз</translation>
     </message>
     <message>
         <source>active/order</source>
         <translation>Активировать/порядок</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Прочие</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>Щелкните для активации/деактивации плагина или используйте кнопки со стрелками для изменения порядка</translation>
     </message>
     <message>
         <source>Today Config</source>
         <translation>Конфигурация</translation>
     </message>
 </context>
 <context>
     <name>TodayConfigMiscBase</name>
     <message>
         <source>Form1</source>
         <translation>Форма1</translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
         <translation>Щелкните, если &quot;Сегодня&quot; должен автоматически загружаться</translation>
     </message>
     <message>
         <source>autostart on resume?</source>
         <translation>загружать автоматически?</translation>
     </message>
     <message>
         <source>tiny banner</source>
         <translation>крошечный заголовок</translation>
     </message>
     <message>
         <source>Have small banner </source>
         <translation>Маленький заголовок</translation>
     </message>
     <message>
         <source> min</source>
         <translation>мин</translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
         <translation>Сколбко минут КПК был выключен до того как автозапуск включается после перерыва</translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation>минут неактивен</translation>
     </message>
     <message>
         <source> pixel</source>
         <translation>пиксель</translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
         <translation>Установить размер иконки в пикселях</translation>
     </message>
     <message>
         <source>icon size</source>
         <translation>размер иконок</translation>
     </message>
     <message>
         <source> sec</source>
         <translation>сек</translation>
     </message>
     <message>
         <source>never</source>
         <translation>никогда</translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
         <translation>Как часто нужно обновлять Сегодня</translation>
     </message>
     <message>
         <source>refresh</source>
         <translation>обновить</translation>
     </message>
 </context>
 </TS>
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
@@ -1,649 +1,565 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Ok</source>
         <translation>Да</translation>
     </message>
     <message>
         <source>&lt;h1&gt;Alarm at %1&lt;/h1&gt;&lt;br&gt;</source>
         <translation>&lt;h1&gt;Извещение в %1&lt;/h1&gt;&lt;br&gt;</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Все</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Без категории</translation>
     </message>
 </context>
 <context>
     <name>NewTaskDlg</name>
     <message>
         <source>New Task</source>
         <translation>Новая задача</translation>
     </message>
     <message>
         <source>Blank task</source>
         <translation>Пустая задача</translation>
     </message>
     <message>
         <source>Using template:</source>
         <translation>Используя шаблон:</translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Alarms</source>
         <translation>Извещения</translation>
     </message>
     <message>
         <source>Information</source>
         <translation>Информация</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Статус</translation>
     </message>
     <message>
         <source>Recurrence</source>
         <translation>Повторение</translation>
     </message>
     <message>
         <source>Task Editor</source>
         <translation>Редактор задач</translation>
     </message>
 </context>
 <context>
     <name>Opie</name>
     <message>
         <source>Todo List</source>
         <translation>Список задач</translation>
     </message>
     <message>
         <source>Task</source>
         <translation>Задача</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
         <translation>Ввести задачу</translation>
     </message>
     <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>Дела не смог
 сохранить изменения.
 Освободите место
 и попробуйте снова.
 
 Все равно выйти?</translation>
     </message>
     <message>
         <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>
         <source>Edit</source>
         <translation>Изменить</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Удалить</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation>Новый образец %1</translation>
     </message>
     <message>
         <source>Click here to set the priority of new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Нажмите здесь чтобы изменить приоритет нового задания.
 
 Это место называется панель быстрого доступа.
 
 Оно позволяет быстро добавить новую задачу в ваш список.  Эта панель может быть скрыта или показана через меню Опции-&gt;&apos;Показать панель быстрого доступа&apos;.</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>Здесь введите описание новой задачи.
 
 Это место называется панель быстрого доступа.
 
 Оно позволяет быстро добавить новую задачу в ваш список.  Эта панель может быть скрыта или показана через меню Опции-&gt;&apos;Показать панель быстрого доступа&apos;.</translation>
     </message>
     <message>
         <source>More</source>
         <translation>Больше</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>Нажмите здесь чтобы ввести дополнительные сведения о новой задаче.
 
 Это место называется панель быстрого доступа.
 
 Оно позволяет быстро добавить новую задачу в ваш список.  Эта панель может быть скрыта или показана через меню Опции-&gt;&apos;Показать панель быстрого доступа&apos;.</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Ввод</translation>
     </message>
     <message>
         <source>Click here to add new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Нажмите чтобы добавить новую задачу.
 
 Это место называется панель быстрого доступа.
 
 Оно позволяет быстро добавить новую задачу в ваш список.  Эта панель может быть скрыта или показана через меню Опции-&gt;&apos;Показать панель быстрого доступа&apos;.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
         <source>Click here to reset new task information.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Нажмите чтобы сбросить сведения о новой задаче.
 
 Это место называется панель быстрого доступа.
 
 Оно позволяет быстро добавить новую задачу в ваш список.  Эта панель может быть скрыта или показана через меню Опции-&gt;&apos;Показать панель быстрого доступа&apos;.</translation>
     </message>
     <message>
         <source>Data can not be edited, currently syncing</source>
         <translation>Не могу ввести данные, идет синхронизация</translation>
     </message>
     <message>
         <source>Data can&apos;t be edited, currently syncing</source>
         <translation>Не могу изменить данные, идет синхронизация</translation>
     </message>
     <message>
         <source>Summary</source>
         <translation>Сводка</translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>Table View</source>
         <translation>В виде таблицы</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Нет</translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation>%1 дней</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>New</source>
         <translation>Новое</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Изменить</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Время</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Description:</source>
         <translation>Описание:</translation>
     </message>
     <message>
         <source>Enter brief description of the task here.</source>
         <translation>Здесь введите краткое описание задачи.</translation>
     </message>
     <message>
         <source>Complete </source>
         <translation>Завершено</translation>
     </message>
     <message>
         <source>Work on </source>
         <translation>Работать над</translation>
     </message>
     <message>
         <source>Buy </source>
         <translation>Купить</translation>
     </message>
     <message>
         <source>Organize </source>
         <translation>Организовать</translation>
     </message>
     <message>
         <source>Get </source>
         <translation>Достать</translation>
     </message>
     <message>
         <source>Update </source>
         <translation>Обновить</translation>
     </message>
     <message>
         <source>Create </source>
         <translation>Очистить</translation>
     </message>
     <message>
         <source>Plan </source>
         <translation>Спланировать</translation>
     </message>
     <message>
         <source>Call </source>
         <translation>Позвонить</translation>
     </message>
     <message>
         <source>Mail </source>
         <translation>По почте</translation>
     </message>
     <message>
         <source>Select priority of task here.</source>
         <translation>Здесь выберите приоритет задачи.</translation>
     </message>
     <message>
         <source>Very High</source>
         <translation>Очень высокий</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Высокий</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Обычный</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Низкий</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>Очень низкий</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Категория:</translation>
     </message>
     <message>
         <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>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>Резюме:</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorStatus</name>
     <message>
         <source>Status:</source>
         <translation>Статус:</translation>
     </message>
     <message>
         <source>Click here to set the current status of this task.</source>
         <translation>Нажмите чтобы изменить статус этой задачи.</translation>
     </message>
     <message>
         <source>Started</source>
         <translation>Начата</translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation>Отложена</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>Завершена</translation>
     </message>
     <message>
         <source>Not started</source>
         <translation>Не начата</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Прогресс:</translation>
     </message>
     <message>
         <source>Select progress made on this task here.</source>
         <translation>Здесь выберите стадию задачи.</translation>
     </message>
     <message>
         <source>0 %</source>
         <translation>0 %</translation>
     </message>
     <message>
         <source>20 %</source>
         <translation>20 %</translation>
     </message>
     <message>
         <source>40 %</source>
         <translation>40 %</translation>
     </message>
     <message>
         <source>60 %</source>
         <translation>60 %</translation>
     </message>
     <message>
         <source>80 %</source>
         <translation>80 %</translation>
     </message>
     <message>
         <source>100 %</source>
         <translation>100 %</translation>
     </message>
     <message>
         <source>Start Date:</source>
         <translation>Начата:</translation>
     </message>
     <message>
         <source>Click here to set the date this task was started.</source>
         <translation>Нажмите чтобы выбрать дату когда задача была начата.</translation>
     </message>
     <message>
         <source>Due Date:</source>
         <translation>Срок:</translation>
     </message>
     <message>
         <source>Click here to set the date this task needs to be completed by.</source>
         <translation>Нажмите чтобы выбрать когда нужно завершить эту задачу.</translation>
     </message>
     <message>
         <source>Completed:</source>
         <translation>Завершена:</translation>
     </message>
     <message>
         <source>Click here to mark this task as completed.</source>
         <translation>Нажмите чтобы отметить эту задачу как завершенную.</translation>
     </message>
     <message>
         <source>Click here to set the date this task was completed.</source>
         <translation>Нажмите чтобы выбрать когда эта задача была завершена.</translation>
     </message>
     <message>
         <source>Maintainer Mode:</source>
         <translation>Режим ведущего:</translation>
     </message>
     <message>
         <source>Click here to set the maintainer&apos;s role.</source>
         <translation>Нажмите чтобы установить роль ведущего.</translation>
     </message>
     <message>
         <source>Nothing</source>
         <translation>Ничего</translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation>Ответственный</translation>
     </message>
     <message>
         <source>Done By</source>
         <translation>Сделано</translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation>Координирующий</translation>
     </message>
     <message>
         <source>Maintainer:</source>
         <translation>Ведущий:</translation>
     </message>
     <message>
         <source>This is the name of the current task maintainer.</source>
         <translation>Это имя ведущего этой задачи.</translation>
     </message>
     <message>
         <source>test</source>
         <translation>тест</translation>
     </message>
     <message>
         <source>Click here to select the task maintainer.</source>
         <translation>Нажмите чтобы выбрать ведущего задачи.</translation>
     </message>
 </context>
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,905 +1,578 @@
 <!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>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Поле 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Поле 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Поле 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Поле 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Поле 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Информация:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Новая запись</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Примечания</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Поле 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Поле 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Пароль</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Имя пользователя</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZСейф</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Пароль</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>ФайлДлг</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>фильтр типов файлов</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation>КомбоСписок ФайлТипФильтр
 
 правка или выбор фильтра</translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation>подтверждает выбор и закрывает форму</translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation>Кнопка &quot;Да&quot;</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation>отменяет выбор и закрывает форму</translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation>Кнопка &quot;Отмена&quot;</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation>показывает выбранное имя файла</translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation>Правка имен файлов
 
 показывает выбранный файл
 и позволяет на лету изменить
 имя файла</translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation>КомбоСписок Каталогов
 
 правка или выбор каталогов</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
         <source>size</source>
         <translation>размер</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Тип</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>каталоги в виде списка</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation>Каталоги в виде списка
 
 показывает список каталогов и файлов</translation>
     </message>
     <message>
         <source></source>
         <translation></translation>
     </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation>папка</translation>
     </message>
     <message>
         <source>file</source>
         <translation>файл</translation>
     </message>
     <message>
         <source>link</source>
         <translation>ссылка</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Поиск</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Имя пользователя</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Примечания</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <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>
         <source>&amp;Import text file</source>
         <translation>&amp;Импорт текст файла</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
         <translation>&amp;Удалить текст файл</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
         <translation>О&amp;ткрывать записи в раскрытом виде</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
         <translation>В&amp;ыйти</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Файл</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Создать</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Правка</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Удалить</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Категория</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Вырезать</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Копировать</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Вставить</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Поиск</translation>
     </message>
     <message>
         <source>&amp;Entry</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>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Поле 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Поле 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Примечания</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Поле 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Поле 5</translation>
     </message>
     <message>
         <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>
         <source>Find entry</source>
         <translation>Поиск записи</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;Да</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Все</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Текст</translation>
     </message>
     <message>
         <source>Remove text file</source>
         <translation>Удалить текстовый файл</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
         <translation>Не могу удалить текстовый файл.</translation>
     </message>
     <message>
         <source>No document defined.
 You have to create a new document</source>
         <translation>Документы не заданы.
 Вы должны создать новый документ</translation>
     </message>
     <message>
         <source>Export text file</source>
         <translation>Экспорт в текстовый файл</translation>
     </message>
     <message>
         <source>Import text file</source>
         <translation>Импорт из текстового файла</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
         <translation>Не смог экспортировать в текст файл.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
         <translation>Не смог импортировать из текст файла.</translation>
     </message>
     <message>
         <source>Enter Password</source>
         <translation>Введите пароль</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
         <translation>Неверный пароль.
 
 ZСейф будет закрыт.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
         <translation>Неверный пароль.
 Попробовать снова?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Да</translation>
     </message>
     <message>
         <source>&amp;No.</source>
         <translation>&amp;Нет.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
         <translation>Пустой документ или
 неверный пароль.
 Продолжить?</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;нет</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
         <translation>&amp;Да.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
         <translation>Пароль пуст.
 Пожалуйста введите снова.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
         <translation>Введите пароль снова</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
         <translation>Пароли должны быть одинаковыми.
 Пожалуйста введите снова.</translation>
     </message>
     <message>
         <source>Do you want to save </source>
         <translation>Вы хотите сохранить</translation>
     </message>
     <message>
         <source>
 before continuing?</source>
         <translation>
 прежде чем продолжить?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation>&amp;Сохранить</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
         <translation>&amp;Не сохранять</translation>
     </message>
     <message>
         <source>Password file saved.</source>
         <translation>Файл паролей сохранен.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
         <translation>Вы хотите сохранить
 перед выходом?</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
         <translation>С&amp;охранить
 с новым
 паролем</translation>
     </message>
     <message>
         <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>
         <source>&lt;P&gt;You must create a new document first. Ok to create?&lt;/P&gt;</source>
         <translation>&lt;P&gt;Сначала вы должны создать новый документ. Создать?&lt;/P&gt;</translation>
     </message>
     <message>
         <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Password Manager&lt;br&gt;ZSafe version 2.1.2&lt;br&gt;&lt;/b&gt;by Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Translations by Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Менеджер Паролей&lt;br&gt;ZСейф версии 2.1.2-jv01b&lt;br&gt;&lt;/b&gt;написан Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Перевод Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <source>Copy to Clipboard</source>
         <translation>Скопировать в буфер обмена</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Правка</translation>
     </message>
     <message>
         <source>Show Info</source>
         <translation>Показать информацию</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
 </context>
 </TS>
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
@@ -1,569 +1,489 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation>Polno ime</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Stik</translation>
     </message>
     <message>
         <source>Pick</source>
         <translation>Izberi</translation>
     </message>
 </context>
 <context>
     <name>AbView</name>
     <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>
         <source>Unable to find a contact for this search pattern!</source>
         <translation>Ne najdem stika za
 iskani vzorec!</translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation>Izbrana datoteka
 nima končnice &quot;.vcf&quot;.
 Ali jo res želite odpreti?</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>Dodam stik?</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>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation>Stil poizvedbe</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>Uporabi regularne izraze</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>Uporabi (*,?)</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Loči male in velike črke</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Pošta</translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation>Raje QT-Pošta</translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation>Raje Opie-Pošta</translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation>Obvestilo: QT-Pošta je
 že naložena v SHARP-ovem
 privzetem ROM-u. Opie-Pošta
 je zastonj!</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Razno</translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation>Nastavitve iskalnika</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Pisava</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Mala</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normalna</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Velika</translation>
     </message>
     <message>
         <source>Order</source>
         <translation>Red</translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation>Izberite red stikov:</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Gor</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Dol</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Dodaj</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Odstrani</translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation>Nastavitve</translation>
     </message>
     <message>
         <source>Click on tab to select one</source>
         <translation>Kliknite na zavihek, da izberete</translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation>Nastavitve za stil iskalne poizvedbe</translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation>Iskalnik pričakuje regularne izraze, če so ti izbrani</translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
         <translation>Iskalnik pričakuje enostavne zvezdice</translation>
     </message>
     <message>
         <source>If selected, search differs between upper and lower chars</source>
         <translation>Če izbrano, iskalnik razlikuje med velikimi in malimi črkami</translation>
     </message>
     <message>
         <source>Font size for list- and card view</source>
         <translation>Velikost pisave za seznam- in kartični pogled</translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
         <translation>Nastavitve pisave za seznam in kartični pregled</translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation>Uporabi Sharpov poštni program, če je navoljo</translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</source>
         <translation>Uporabi OPIE pošto že je naložena</translation>
     </message>
     <message>
         <source>Move selected attribute one line up</source>
         <translation>Premakni izbrani parameter eno vrstico gor</translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation>Premakni izbrani parameter eno vrstico dol</translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation>Seznam vseh dostopnih parametrov</translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation>Dodaj izbrani parameter iz seznama spodaj v gornji seznam</translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation>Odstrani izbrani parameter iz gornjega seznama</translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation>Red (gor -&gt; dol) definira prvi stik prikazan v naslednjem stolpcu seznama</translation>
     </message>
     <message>
         <source>Tool-/Menubar</source>
         <translation>Orodna-/Menujska vrstica</translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation>Popravljeno</translation>
     </message>
     <message>
         <source>Switch to fixed menu-/toolbars after restarting application !</source>
         <translation>Preklopi na stalno orodno-/menujsko vrstico, ko se program ponovno zažene !</translation>
     </message>
     <message>
         <source>Moveable</source>
         <translation>Mobilno</translation>
     </message>
     <message>
         <source>Switch to moveable menu-/toolbars after restarting application !</source>
         <translation>Preklopi na mobilno orodno-/menujsko vrstico, ko se program ponovno zaženo !</translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>First Name</source>
         <translation>Ime</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Medimek</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Priimek</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Pripona</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Datoteka kot</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Spol</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Delovno mesto</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Mesto</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Pokrajina</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>Država</translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation>Polno ime...</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Organizacija</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategorija</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Zapiski...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Splošno</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Službeno</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Dom</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Naslov</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>Poštna številka</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>Združene države</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Velika Britanija</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>Japonska</translation>
     </message>
     <message>
         <source>France</source>
         <translation>Francija</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>Nemčija</translation>
     </message>
     <message>
         <source>Norway</source>
         <translation>Norveška</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>Kanada</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Moški</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Ženski</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Podrobnosti</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>Vpišite zapiske</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>Uredi ime</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Stiki</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation>Albanija</translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation>Alžirija</translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation>Ameriška Samoa</translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation>Andora</translation>
     </message>
     <message>
         <source>Angola</source>
         <translation>Angola</translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation>Anguilla</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>Argentina</translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation>Aruba</translation>
     </message>
     <message>
         <source>Australia</source>
         <translation>Avstralija</translation>
     </message>
     <message>
         <source>Austria</source>
         <translation>Avstrija</translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation>Azerbaijan</translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation>Bahami</translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation>Bahrain</translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation>Bangladeš</translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation>Barbados</translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation>Belorusija</translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation>Belgija</translation>
     </message>
     <message>
@@ -1013,552 +933,385 @@ je zastonj!</translation>
     <message>
         <source>Oman</source>
         <translation>Oman</translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation>Pakistan</translation>
     </message>
     <message>
         <source>Palau</source>
         <translation>Palau</translation>
     </message>
     <message>
         <source>Panama</source>
         <translation>Panama</translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation>Papva Nova Gvineja</translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation>Paragvaj</translation>
     </message>
     <message>
         <source>Peru</source>
         <translation>Peru</translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation>Filipini</translation>
     </message>
     <message>
         <source>Poland</source>
         <translation>Polska</translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation>Portugalska</translation>
     </message>
     <message>
         <source>Puerto Rico</source>
         <translation>Porto Riko</translation>
     </message>
     <message>
         <source>Qatar</source>
         <translation>Qutar</translation>
     </message>
     <message>
         <source>Reunion</source>
         <translation>Reunion</translation>
     </message>
     <message>
         <source>Romania</source>
         <translation>Romunija</translation>
     </message>
     <message>
         <source>Russia</source>
         <translation>Rusija</translation>
     </message>
     <message>
         <source>Rwanda</source>
         <translation>Ruanda</translation>
     </message>
     <message>
         <source>Saint Lucia</source>
         <translation>Sveta Lucija</translation>
     </message>
     <message>
         <source>Samoa</source>
         <translation>Samoa</translation>
     </message>
     <message>
         <source>San Marino</source>
         <translation>San Marino</translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
         <translation>Savdska Arabija</translation>
     </message>
     <message>
         <source>Senegal</source>
         <translation>Senegal</translation>
     </message>
     <message>
         <source>Seychelles</source>
         <translation>Sečili</translation>
     </message>
     <message>
         <source>Sierra Leone</source>
         <translation>Siera Leone</translation>
     </message>
     <message>
         <source>Singapore</source>
         <translation>Singapur</translation>
     </message>
     <message>
         <source>Slovakia</source>
         <translation>Slovaška</translation>
     </message>
     <message>
         <source>Slovenia</source>
         <translation>Slovenija</translation>
     </message>
     <message>
         <source>Solomon Islands</source>
         <translation>Salamonovi Otoki</translation>
     </message>
     <message>
         <source>Somalia</source>
         <translation>Somalija</translation>
     </message>
     <message>
         <source>South Africa</source>
         <translation>Južna Afrika</translation>
     </message>
     <message>
         <source>Spain</source>
         <translation>Španija</translation>
     </message>
     <message>
         <source>Sri Lanka</source>
         <translation>Šri Lanka</translation>
     </message>
     <message>
         <source>St. Helena</source>
         <translation>Sveta  Helena</translation>
     </message>
     <message>
         <source>Sudan</source>
         <translation>Sudan</translation>
     </message>
     <message>
         <source>Suriname</source>
         <translation>Suriname</translation>
     </message>
     <message>
         <source>Swaziland</source>
         <translation>Swaziland</translation>
     </message>
     <message>
         <source>Sweden</source>
         <translation>Švedska</translation>
     </message>
     <message>
         <source>Switzerland</source>
         <translation>Švica</translation>
     </message>
     <message>
         <source>Taiwan</source>
         <translation>Tajvan</translation>
     </message>
     <message>
         <source>Tajikistan</source>
         <translation>Tadžikistan</translation>
     </message>
     <message>
         <source>Tanzania</source>
         <translation>Tanzanija</translation>
     </message>
     <message>
         <source>Thailand</source>
         <translation>Tajska</translation>
     </message>
     <message>
         <source>Togo</source>
         <translation>Togo</translation>
     </message>
     <message>
         <source>Tokelau</source>
         <translation>Tokelau</translation>
     </message>
     <message>
         <source>Tonga</source>
         <translation>Tonga</translation>
     </message>
     <message>
         <source>Tunisia</source>
         <translation>Tunizija</translation>
     </message>
     <message>
         <source>Turkey</source>
         <translation>Turčija</translation>
     </message>
     <message>
         <source>Turkmenistan</source>
         <translation>Turkmenistan</translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation>Tuvalu</translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation>Uganda</translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation>Ukrajina</translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation>Urugvaj</translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation>Uzbekistan</translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation>Vanuatu</translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation>Venezuela</translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation>Deviški Otoki</translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation>Zahodna Sahara</translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation>Jemen</translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation>Jugoslavija</translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation>Zambija</translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation>Zimbabve</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Rojstni dan</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Obletnica</translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation>Kuvajt</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Neznan</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
         <source>Afghanistan</source>
         <translation>Afganistan</translation>
     </message>
     <message>
         <source>Antarctica</source>
         <translation>Antartika</translation>
     </message>
     <message>
         <source>Armenia</source>
         <translation>Armenija</translation>
     </message>
     <message>
         <source>Bolivia</source>
         <translation>Bolivija</translation>
     </message>
     <message>
         <source>Cameroon</source>
         <translation>Kamerun</translation>
     </message>
     <message>
         <source>Ghana</source>
         <translation>Gana</translation>
     </message>
     <message>
         <source>Guadeloupe</source>
         <translation>Guadeloupe</translation>
     </message>
     <message>
         <source>Guinea-Bissau</source>
         <translation>Guinea-Bissau</translation>
     </message>
     <message>
         <source>Jamaica</source>
         <translation>Jamajka</translation>
     </message>
     <message>
         <source>Kiribati</source>
         <translation>Kiribati</translation>
     </message>
     <message>
         <source>Kyrgyzstan</source>
         <translation>Kyrgyzstan</translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
         <translation>Palestinian Sovereign Areas</translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
         <translation>Pitcairn Islands</translation>
     </message>
     <message>
         <source>Vietnam</source>
         <translation>Vietnam</translation>
     </message>
     <message>
         <source>Press to enter last- middle and firstname</source>
         <translation>Pritisnite, da vpišete priimek- in ime</translation>
     </message>
     <message>
         <source>Enter fullname directly ! If you have a lastname with multiple words ( for instance &quot;de la Guerra&quot;), please write &lt;lastname&gt;,&lt;firstnames&gt; like this: &quot;de la Guerra, Carlos Pedro&quot;</source>
         <translation>Vpišite celo ime direktno! Če imate več priimkov (primer: &quot;Božič Novak&quot; ), prosimo vpišite &lt;priimek&gt;,&lt;ime&gt; kot to: &quot;Božič Novak, Jože&quot;</translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation>Naziv delovnega mesta..</translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation>Nekaj kot &quot;ml.&quot;..</translation>
     </message>
     <message>
         <source>The working place of the contact</source>
         <translation>Delovno mesto stika</translation>
     </message>
     <message>
         <source>Press to select attribute to change</source>
         <translation>Pritisnite, da izberete parameter, ki bi ga radi spremenili</translation>
     </message>
     <message>
         <source>Press to select how to store the name (and howto show it in the listview)</source>
         <translation>Pristisnite, da izberete kako shraniti ime (in kako ga prikazati v seznamu)</translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie</name>
     <message>
         <source>Contact</source>
         <translation type="unfinished">Stik</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation type="unfinished">Stiki</translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation type="unfinished">Začni iskanje</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation type="unfinished">Pošlji epošto</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation type="unfinished">Uvozi vCard</translation>
     </message>
     <message>
         <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
@@ -1,421 +1,358 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>AdvancedFm</source>
         <translation>NapredniDu</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Datoteka</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Pogled</translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation>Prikaži skrite datoteke</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>Ustvari imenik</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Preimenuj</translation>
     </message>
     <message>
         <source>Run Command</source>
         <translation>Poženi ukaz</translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation>Poženi ukaz z izhodom</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Velikost</translation>
     </message>
     <message>
         <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>Yes</source>
         <translation>Da</translation>
     </message>
     <message>
         <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>
         <source>Ir sent.</source>
         <translation>Ir poslan.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Vredu</translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>Zamenjaj imenik</translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>Izvrši</translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation>Odpri kot besedilo</translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation>Ustvari povezavo</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Kopiraj</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>Prestavi</translation>
     </message>
     <message>
         <source>File Info</source>
         <translation>Informacije o datoteki</translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation>Nastavi pravice</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Lastnosti</translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation>Prežarči datoteko</translation>
     </message>
     <message>
         <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>
         <source>File Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AdvancedFm :: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> kB free</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to View 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to View 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not Yet Implemented</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&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>
         <source>Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1 files?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1 and all it&apos;s contents?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really copy %1 files?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 already  exists. Ok to overwrite?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Could not copy %1 to %2&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy %1 As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt; %1 already exists. Ok to overwrite?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not copy %1 to %2&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt; %1 already exists. Do you really want to delete it?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not move %1&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not copy %1 to %2&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Shrani izhod v datoteko (samo ime)</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Izhod</translation>
     </message>
     <message>
         <source>Process could not start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Finished
 </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Nastavi datotečne pravice</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Nastavi datotečne pravice za:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>lastnik</translation>
     </message>
     <message>
         <source>group</source>
         <translation>skupina</translation>
     </message>
     <message>
         <source>others</source>
         <translation>drugi</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Lastnik</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Skupina</translation>
     </message>
     <message>
         <source>read</source>
         <translation>beri</translation>
     </message>
     <message>
         <source>write</source>
         <translation>piši</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>izvrši</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>filePermissions</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,293 +1,233 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Appearance</name>
     <message>
         <source>Settings...</source>
         <translation>Nastavitve...</translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation>Trenutna shema</translation>
     </message>
     <message>
         <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>
         <source>Drop down list</source>
         <translation>Roletni seznam</translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation>Roletni seznam - ikone</translation>
     </message>
     <message>
         <source>Top</source>
         <translation>Zgoraj</translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation>Spodaj</translation>
     </message>
     <message>
         <source>Style</source>
         <translation>Stil</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Pisava</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Barve</translation>
     </message>
     <message>
         <source>Windows</source>
         <translation>Okna</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Napredno</translation>
     </message>
     <message>
-        <source>Restart</source>
-        <translation 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.
 
 Opozorilo: Ta opcija ni na voljo v vseh stilih.</translation>
     </message>
     <message>
         <source>Window decorations control the way the application title bar and its buttons appear.
 
 Click here to select an available decoration.</source>
         <translation>Dekoracija oken nadzoruje kako se naslovna letev ter gumbi prikazujejo v programih.
 
 Kliknite tu, da izberete dekoracije, ki so na voljo.</translation>
     </message>
     <message>
         <source>Select the desired name, style and size of the default font applications will use.</source>
         <translation>Izberite željeno ime, stil in velikost privzete pisave, ki jo bodo programi uporabljali.</translation>
     </message>
     <message>
         <source>Color schemes are a collection of colors which are used for various parts of the display.
 
 Click here to select an available scheme.</source>
         <translation>Barvne sheme so zbirke barv, ki so uporabljene v različnih delih prikaza.
 
 Kliknite tu, da izberete željeno shemo.</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation>Kliknite tu, da se zavihki prikažejo na vrhu okna.</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation>Kliknite tu, da se zavihki prikažejo na dnu okna.</translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation>To je predogled. Tu vidite svoj novi izgled med tem, ko spreminjate opcije.</translation>
     </message>
     <message>
         <source>Appearance Settings</source>
         <translation>Nastavitve izgleda</translation>
     </message>
     <message>
         <source>Rotation direction:</source>
         <translation>Orientacija smeri:</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>
         <translation>Uredi shemo</translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation>Kliknite tu, da izberete barvo za:</translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
         <translation>Primer</translation>
     </message>
     <message>
         <source>Normal Item</source>
         <translation>Normalna reč</translation>
     </message>
     <message>
         <source>Disabled Item</source>
         <translation>Izključena reč</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Menu</translation>
     </message>
     <message>
         <source>Normal Text</source>
         <translation>Normalno besedilo</translation>
     </message>
     <message>
         <source>Highlighted Text</source>
         <translation>Osvetljeno besedilo</translation>
     </message>
     <message>
         <source>Button</source>
         <translation>Gumb</translation>
     </message>
     <message>
         <source>Check Box</source>
         <translation>Označnik</translation>
     </message>
     <message>
         <source>Sample window using the selected settings.</source>
         <translation>Primer okna, ki upporablja izbrane nastavitve.</translation>
     </message>
 </context>
 </TS>
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
@@ -104,573 +104,565 @@
     </message>
     <message>
         <source>Save output</source>
         <translation>Shrani izhod</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Neznano</translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation>Možnosti</translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation>Prisili odvisne</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation>Prisili ponovno nalaganje</translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation>Prisili odstranjevanje</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation>Prisili prepis</translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation>Stopnja informiranosti</translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation>Samo napake</translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation>Normalna sporočila</translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation>Informativna sporočila</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation>Problematičen izhod</translation>
     </message>
 </context>
 <context>
     <name>Ipkg</name>
     <message>
         <source>Dealing with package %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing symbolic links...
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Creating symbolic links for %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Creating symbolic links for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing status entry...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>status file - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>package - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>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>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation>AQPkg - Paketni upravljalnik</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation>Tu vpišite besedilo za iskanje.</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation>Kliknite tu, da skrijete Hitroskočno orodno vrstico.</translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation>Posodobi sezname</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation>Kliknite tu, da posodobite paketne sezname iz strežnikov.</translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation>Nadgradi</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation>Kliknite tu, da nadgradite vse naložene pakete, če je novejša različica na voljo.</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Prenesi k sebi</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation>Kliknite tu, da prenesete k sebi trenutno izbran(e) paket(e).</translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation>Uveljavi spremembe</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation>Kliknite tu, da naložite, odstranite ali posodbite trenutno izbran(e) paket(e).</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Dejanja</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation>Prikaži pakete, ki niso naloženi</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation>Kliknite tu, da prikažem nenaložene pakete, ki so na voljo.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation>Prikaži naložene pakete</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation>Kliknite tu, da prikažem pakete, ki so trenutno naloženi na tej napravi.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation>Prikaži posodobljene pakete</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation>Kliknite tu, da prikažem pakete, ki so trenutno naloženi na tej napravi in imajo na voljo novejšo različico.</translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation>Filter po kategoriji</translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation>Kliknite tu, da prikažem pakete, ki pripadajo eni kategoriji.</translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation>Nastavi filter kategorije</translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation>Kliknite tu, da zamenjate kategorijo paketa za uporabljen filter.</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Najdi</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation>Kliknite tu, da najdete besedilo v paketnih imenih.</translation>
     </message>
     <message>
         <source>Find next</source>
         <translation>Najdi naslednjo</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation>Kliknite tu, da najdete naslednje ime paketa, ki vsebuje iskano besedilo.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation>Hitroskočne smerne tipke</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation>Kliknite tu, da prikažem/skrijem smerne tipke, da se lažje premikate po paketnem seznamu.</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Pogled</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Spremeni nastavitve</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation>Kliknite tu, da spremenite nastavitve temu programu.</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation>Kliknite tu, da skijem iskalno orodno vrstico.</translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation>Strežniki:</translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation>Kliknite tu, da izberete paketni vir.</translation>
     </message>
     <message>
         <source>Packages</source>
         <translation>Paketi</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 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>To je seznam vseh paketev iz strežniškega vira izbranega zgoraj.
 
 Modra pika pri imenu paketa pove, da je paket trenutno nameščen.
 
 Modra pika z zvezdico pove, da je novejša različica paketa na voljo iz strežniškega vira.
 
 Kliknite v škatlico levo od pakete, da le tega izberete.</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Odstrani</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation>Kliknite tu, da odstranite trenutno izbran(e) paket(e).</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation>Gradim seznam strežnikov:
 %1</translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation>Gradim seznam paketov za:
 %1</translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
         <translation>Osvežujem strežniški seznam paketov</translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation>OPOZORILO: Posodabljanje med 
 tem, ko Opie teče
 NI priporočljivo!
 
 Ste prepričani?
 </translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Opozorilo</translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
         <translation>Posodabljam naložene pakete</translation>
     </message>
     <message>
         <source>Are you sure you wish to delete
 %1?</source>
         <translation>Ali ste prepričani da želite izbrisati
 %1?</translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation>Ste prepričani?</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Ne</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Da</translation>
     </message>
     <message>
         <source>Download to where</source>
         <translation>Cilj prenosa</translation>
     </message>
     <message>
         <source>Enter path to download to</source>
         <translation>Vpišite pot za prenos za</translation>
     </message>
     <message>
         <source>Install Remote Package</source>
         <translation>Naloži odaljeni paket</translation>
     </message>
     <message>
         <source>Enter package location</source>
         <translation>Vpišite lokacijo paketa</translation>
     </message>
     <message>
         <source>Nothing to do</source>
         <translation>Nič ni za naredit</translation>
     </message>
     <message>
         <source>No packages selected</source>
         <translation>Nič paketov izbranih</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Vredu</translation>
     </message>
     <message>
         <source>Do you wish to remove or reinstall
 %1?</source>
         <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>
         <translation>&lt;p&gt;&lt;b&gt;Naloženo na&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Velikost&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Odsek&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Ime datoteke&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Naložena različica&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Različica, ki je na voljo&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>Package Information</source>
         <translation>Informacije o paketu</translation>
     </message>
     <message>
         <source>Package information is unavailable</source>
         <translation>Informacije o paketu niso na voljo</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Zapri</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Local packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>N/A</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package - %1
               version - %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
               inst version - %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Version string is empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Epoch in version is not number.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nothing after colon in version number.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QuestionDlg</name>
     <message>
         <source>Remove</source>
         <translation type="unfinished">Odstrani</translation>
     </message>
 </context>
 <context>
     <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation>Spremeni nastavitve</translation>
     </message>
     <message>
         <source>Servers</source>
         <translation>Strežniki</translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation>Cilj</translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation>Posredniki</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nov</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Strežnik</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Ime:</translation>
     </message>
     <message>
         <source>Address:</source>
         <translation>Naslov:</translation>
     </message>
     <message>
         <source>Active Server</source>
         <translation>Aktivni strežnik</translation>
     </message>
     <message>
         <source>Update</source>
         <translation>Posodobi</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation>Cilj</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Lokacija:</translation>
     </message>
     <message>
         <source>Link to root</source>
         <translation>Povezava do korena</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
         <translation>HTTP posrednik</translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation>Vključen</translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation>FTP posrednik</translation>
     </message>
     <message>
         <source>Username:</source>
         <translation>Uporabniško ime:</translation>
     </message>
     <message>
         <source>Password:</source>
         <translation>Geslo:</translation>
     </message>
 </context>
 </TS>
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,156 +1,148 @@
 <!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>
     <message>
         <source>Backup Failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup and Restore.. Failed !!</source>
         <translation type="unfinished"></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 type="unfinished"></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>
         <source>Restore Backup...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;%1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore</source>
         <translation type="unfinished">Restavriraj</translation>
     </message>
     <message>
         <source>Would you really overwrite your local data?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <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>
         <source>Column 1</source>
         <translation>Stolpec 1</translation>
     </message>
     <message>
         <source>&amp;Restore</source>
         <translation>&amp;Restavriraj</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>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ErrorDialog</name>
     <message>
         <source>Error Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error Message:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,339 +1,331 @@
 <!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>
         <source>CE</source>
         <translation>CE</translation>
     </message>
     <message>
         <source>log</source>
         <translation>log</translation>
     </message>
     <message>
         <source>ln</source>
         <translation>ln</translation>
     </message>
     <message>
         <source>(</source>
         <translation>(</translation>
     </message>
     <message>
         <source>)</source>
         <translation>)</translation>
     </message>
     <message>
         <source>sin</source>
         <translation>sin</translation>
     </message>
     <message>
         <source>cos</source>
         <translation>cos</translation>
     </message>
     <message>
         <source>tan</source>
         <translation>tan</translation>
     </message>
     <message>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
         <source>+/-</source>
         <translation>+/-</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>=</source>
         <translation>=</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>.</source>
         <translation>.</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Distance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>acres</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&#xb0;C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>carats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&#xb0;F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>fl oz (US)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>g</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>gal (US)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>hectares</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>km</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>l</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>lb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lg tons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ml</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>naut. mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>oz</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>pt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>qt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq km</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq yd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>St tons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tblspoon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>teaspoons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tonnes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>yd</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,750 +1,646 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation>Čekovna knjižica</translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation>Nova čekovna knjižica</translation>
     </message>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation>Transakcije</translation>
     </message>
     <message>
         <source>Charts</source>
         <translation>Grafi</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Ime:</translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation>Vpišite ime čekovne knjižice.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tip:</translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation>Izberite tip čekovne knjižice.</translation>
     </message>
     <message>
-        <source>Savings</source>
-        <translation 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>
         <source>Enter account number for this checkbook here.</source>
         <translation>Vpišite številko računa za to čekovno knjižico.</translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation>Številka PIN:</translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation>Vpišite številko PIN za to čekovno knjižico.</translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation>Začetno stanje:</translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation>Vpišite začetno stanje za to čekovno knjižico.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Zapiski:</translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation>Vpišite dodatne informacije za to čekovno knjižico.</translation>
     </message>
     <message>
-        <source>Current balance: %10.00</source>
-        <translation 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>
         <source>Description</source>
         <translation>Opis</translation>
     </message>
     <message>
         <source>Amount</source>
         <translation>Vsota</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nova</translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation>Kliknite tu, da dodate novo transakcijo.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Uredi</translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation>Izberite transakcijo, nato pa kliknite tu, da jo uredite.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation>Izberite čekovno knjižico in nato kliknite tu da jo izbrišete.</translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation>Izberite željen graf spodaj in nato kliknite na gumb Riši.</translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation>Kliknite tu, da izberete željeni tip grafa.</translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation>Stanje računa</translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation>Dvigi po kategoriji</translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation>Pologi po kategoriji</translation>
     </message>
     <message>
         <source>Draw</source>
         <translation>Riši</translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation>Kliknite tu, da narišem izbran graf.</translation>
     </message>
     <message>
-        <source>Current balance: %1%2</source>
-        <translation type="obsolete">Trenutno stanje: %1%2</translation>
-    </message>
-    <message>
         <source>Delete transaction</source>
         <translation>Izbriši transakcijo</translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation>Zaščita z geslom</translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation>Kliknite tu, da vključite/izključite zaščito z geslom na čekovni knjižici.</translation>
     </message>
     <message>
         <source>Num</source>
         <translation>Številka</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Vnesite geslo</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Prosim vnesite vaše geslo:</translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation>Potrdite geslo</translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation>Prosim potrdite vaše geslo:</translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation>Prosim vnesite vaše geslo, da potrdite odstranitev zaščite z geslom:</translation>
     </message>
     <message>
         <source>Sort by:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select checkbook sorting here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entry Order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SortDate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Balance</source>
         <translation type="unfinished">Stanje</translation>
     </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation>Spremeni nastavitve čekovne knjižice</translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation>Vpšite simbol za valuto:</translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation>Vpišite vaš lokalen simbol za valuto.</translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation>Prikaži, če je čekovna knjižica zaščitena
 z geslom</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
         <translation>Kliknite tu, da izberete, če želite, da glavno okno prikaže ali je čekovna knjižica zaščitena z geslom.</translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation>Prikaži stanja čekovne knjižice</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation>Kliknite tu, da izberete, če želite, da glavno okno prikaže trenutno stanje za vsako čekovno knjižico.</translation>
     </message>
     <message>
         <source>&amp;Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Account Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Account Types</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Payees</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open last checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether the last open checkbook will be opened at startup.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show last checkbook tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save new description as payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to save new descriptions in the list of payess.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ListEdit</name>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Izbriši</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation>Čekovna knjižica</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nova</translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation>Kliknite tu, da ustvarite novo čekovno knjižico.
 
 Lahko pa tudi izberete Nova iz menuja.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Uredi</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation>Izberite čekovno knjižico in nato kliknite tu da jo uredite.
 
 Lahko tudi izberete Uredi iz menija ali pa kliknete in zadržite na imenu čekovne knjižice.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation>Izberite čekovno knjižico in nato kliknite tu da jo izbrišete.
 
 Lahko tudi izberete Izbriši iz menuja.</translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation>To je seznam vseh čekovnih knjižic, ki so trenutno na voljo.</translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation>Izbriši čekovno knjižico</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Spremeni nastavitve</translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation>Kliknite tu, da spremenite nastavitve za ta program.</translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation>Ime čekovne knjižice</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>Stanje</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Vnesite geslo</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Prosim vnesite geslo:</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>Date</source>
         <translation type="unfinished">Datum</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Uredi</translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished">Nova</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Izbriši</translation>
     </message>
     <message>
         <source>Savings</source>
         <translation type="unfinished">Prihranki</translation>
     </message>
     <message>
         <source>Checking</source>
         <translation type="unfinished">Preverjam</translation>
     </message>
     <message>
         <source>CD</source>
         <translation type="unfinished">CD</translation>
     </message>
     <message>
         <source>Money market</source>
         <translation type="unfinished">Denarni trg</translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation type="unfinished">Skupni fond</translation>
     </message>
     <message>
         <source>Other</source>
         <translation type="unfinished">Drugo</translation>
     </message>
     <message>
         <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation type="unfinished">Avto</translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="unfinished">Računi</translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="unfinished">CDji</translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="unfinished">Oblačila</translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="unfinished">Računalnik</translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="unfinished">DVDji</translation>
     </message>
     <message>
         <source>Electronics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation type="unfinished">Zabava</translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="unfinished">Hrana</translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="unfinished">Bencin</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished">Različno</translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="unfinished">Filmi</translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="unfinished">Najem</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished">Potovanje</translation>
     </message>
     <message>
         <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished">Delo</translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation type="unfinished">Član družine</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation type="unfinished">Različni krediti</translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation>Transakcija za</translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation>Dvig</translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation>Izberite ali je transakcija dvig ali polog.</translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation>Polog</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Datum:</translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation>Izberite datum za transakcijo.</translation>
     </message>
     <message>
         <source>Number:</source>
         <translation>Številka:</translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation>Vpišite številko čeka.</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Opis:</translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation>Vpišite opis transakcije.</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorija:</translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation>Izberite kategorijo transakcije.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tip:</translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation>Izberite tip transakcije.
 
 Možnosti, ki so na voljo so odvisne od tega ali je transakcija polog ali pa dvig.</translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation>Vsota:</translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation>Vnesite vsoto transakcije.
 
 Vnesena vrednost mora biti pozitivna.</translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation>Pristojbina:</translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation>Vnesite vsoto pristojbine povezane s to transakcijo.
 
 Vnesena vrednost mora biti pozitivna.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Zapiski:</translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation>Vnesite dodatne informacije za transakcijo.</translation>
     </message>
     <message>
-        <source>Automobile</source>
-        <translation 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
@@ -1,283 +1,206 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AlarmDlg</name>
     <message>
         <source>Clock</source>
         <translation type="unfinished">Ura</translation>
     </message>
     <message>
         <source>Snooze</source>
         <translation type="unfinished">Dremež</translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AlarmDlgBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>TextLabel1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Snooze</source>
         <translation type="unfinished">Dremež</translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thu</source>
         <comment>Thursday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fri</source>
         <comment>Friday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat</source>
         <comment>Saturday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sun</source>
         <comment>Sunday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lap/Split</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Daily Alarm:&lt;/b&gt;&lt;p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily alarm requires at least
 one day to be selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished">Vse</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished">Audio</translation>
     </message>
 </context>
 <context>
     <name>ClockBase</name>
     <message>
         <source>Clock</source>
         <translation type="unfinished">Ura</translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stopwatch</source>
         <translation type="unfinished">Štoparica</translation>
     </message>
     <message>
         <source>Split</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished">Start</translation>
     </message>
     <message>
         <source>Starts and stops the stopwatch.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lap/Split</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Resets the stopwatch.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check to enable the daily alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the hour the alarm will sound.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the minute the alarm will sound.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished">AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished">PM</translation>
     </message>
     <message>
         <source>Days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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
@@ -1,861 +1,830 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation>Koledar</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nov</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>Danes</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dan</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Teden</translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation>Teden. seznam</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mesec</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Najdi</translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation>Dogodek je potencialno daljsi,
 kot interval med ponovitvijo.</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Ne morem urediti podatkov, trenutno sinhroniziram</translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation>Uredi dogodke</translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation>minut)</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Vredu</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Zmanjkalo je prostora</translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation>Koledar ne more shraniti
 vaših sprememb.
 Sprostite nekaj prostora in
 poizkusite ponovno.
 
 Izhod?</translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation>(Neznano)</translation>
     </message>
     <message>
         <source>Error!</source>
         <translation>Napaka!</translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation>Popravi</translation>
     </message>
     <message>
         <source>Continue</source>
         <translation>Nadaljuj</translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation>Podvojeni dogodek</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>Uredi...</translation>
     </message>
     <message>
         <source>error box</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation>P</translation>
     </message>
     <message>
         <source>T</source>
         <translation>T</translation>
     </message>
     <message>
         <source>W</source>
         <translation>S</translation>
     </message>
     <message>
         <source>F</source>
         <translation>P</translation>
     </message>
     <message>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Ponedeljek</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Torek</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Sreda</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Četrtek</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Petek</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sobota</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Nedelja</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00p</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation>Začetek</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Konec</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Uredi</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Prežarči</translation>
     </message>
     <message>
         <source>This is an all day event.</source>
         <translation>To je celodnevni dogodek.</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Čas</translation>
     </message>
     <message>
         <source> - </source>
         <translation>-</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Podvoji</translation>
     </message>
     <message>
         <source>Beam this occurence</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation>:00 PM</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation>:00 AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Koledar</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>Možnosti</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation>Začni pregledovati dogodke</translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation>Začetni čas:</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation>Nastavitev alarma</translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation>Prednastavitev alarma</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>minut</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Različno</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>Stil vrstice:</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Privzet</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Srednji</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Velik</translation>
     </message>
     <message>
         <source>Views</source>
         <translation>Pogledi</translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation>Privzet pogled:</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dan</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Teden</translation>
     </message>
     <message>
         <source>Week List</source>
         <translation>Tedenski seznam</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mesec</translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation>Skoči na trenutni čas</translation>
     </message>
     <message>
         <source>Time display</source>
         <translation>Prikaz časa</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Brez</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Začetek</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation>Začetek-Konec</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Privzeto</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Lokacija:</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Pisarna</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Dom</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorija:</translation>
     </message>
+    <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>
         <translation>t</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Jan-00. Jan</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstEvent</name>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Uredi</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished">Podvoji</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Izbriši</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished">Prežarči</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>t</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>T: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
-        <source>M</source>
-        <comment>Monday</comment>
-        <translation type="obsolete">P</translation>
-    </message>
-    <message>
-        <source>T</source>
-        <comment>Tuesday</comment>
-        <translation type="obsolete">T</translation>
-    </message>
-    <message>
-        <source>W</source>
-        <comment>Wednesday</comment>
-        <translation type="obsolete">S</translation>
-    </message>
-    <message>
-        <source>T</source>
-        <comment>Thursday</comment>
-        <translation type="obsolete">Č</translation>
-    </message>
-    <message>
-        <source>F</source>
-        <comment>Friday</comment>
-        <translation type="obsolete">P</translation>
-    </message>
-    <message>
-        <source>S</source>
-        <comment>Saturday</comment>
-        <translation type="obsolete">S</translation>
-    </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>
         <translation>Ponovi...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>Dnevno...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>Tedensko...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>Mesečno...</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>Letno...</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Ne ponovi...</translation>
     </message>
     <message>
         <source>Start Time</source>
         <translation>Začetni čas</translation>
     </message>
     <message>
         <source>End Time</source>
         <translation>Končni čas</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>Nov dogodek</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Lokacija</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategorija</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Sestanek</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Kosilo</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Večerja</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Potovanje</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Pisarna</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Dom</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>Jan 02 00</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Cel dan</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Alarm</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>minut</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Tiho</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Glasno</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Ponovi</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Ne ponovi...</translation>
     </message>
     <message>
         <source>Start time</source>
         <translation type="unfinished">Začetni čas</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Časovni pas</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Opis</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>Začetek - Konec</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Opombe...</translation>
     </message>
-    <message>
-        <source>Start Time</source>
-        <translation type="obsolete">Začetni čas</translation>
-    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Uredi opombo</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Kosilo</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Začetek</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Konec</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Vsak</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>Vsak %1 %2</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>Vsak %1</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>%1 %1 od vsakega</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Vsak</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Ponedeljek</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Torek</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Sreda</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Četrtek</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Petek</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sobota</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Nedelja</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation></translation>
     </message>
     <message>
         <source>nd</source>
         <translation></translation>
     </message>
     <message>
         <source>rd</source>
         <translation></translation>
     </message>
     <message>
         <source>th</source>
         <translation></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation>Ne ponovi</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>dni</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>tednov</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Ponovi</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dan</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>mesecev</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>let</translation>
     </message>
     <message>
         <source>days</source>
         <translation>dni</translation>
     </message>
     <message>
         <source>day</source>
         <translation>dan</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>tednov</translation>
     </message>
     <message>
         <source>week</source>
         <translation>teden</translation>
     </message>
     <message>
         <source>month</source>
         <translation>mesec</translation>
     </message>
     <message>
         <source>year</source>
         <translation>leto</translation>
     </message>
     <message>
         <source> and </source>
         <translation>in</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
 in</translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, in</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Ponavljajoči dogodek</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Brez</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dan</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Teden</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mesec</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Leto</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Vsak:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Frekvenca</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Končaj na:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Brez končnega datuma</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Ponovi</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Pon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Tor</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Sre</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Čet</translation>
     </message>
     <message>
         <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>Every</source>
         <translation>Vsak</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Spremenljivka1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Spremenljivka 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>TedenskaSpremenljivka</translation>
     </message>
     <message>
         <source>months</source>
         <translation>meseci</translation>
     </message>
     <message>
         <source>years</source>
         <translation>leta</translation>
     </message>
 </context>
 </TS>
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
@@ -1,293 +1,249 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation>Izbira ukazov</translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation>Ukazi</translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Ukazi&lt;/B&gt;:</translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Predlagani ukazi&lt;/B&gt;:</translation>
     </message>
 </context>
 <context>
     <name>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>
         <source>Tab</source>
         <translation>Tab</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Gor</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Dol</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Prilepi</translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation>Prikaži seznam ukazov</translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation>Skrij seznam ukazov</translation>
     </message>
     <message>
-        <source>Tabs on Bottom</source>
-        <translation 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>
         <source>Cyan on White</source>
         <translation>Svetlo modra na beli</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>Bela na svetlo modri</translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation>Modra na črni</translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation>Amber na črni</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Barve</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Hitro uredi</translation>
     </message>
     <message>
-        <source>Edit</source>
-        <translation 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>
         <source>ScrollBar</source>
         <translation>Drsnik</translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation>Prikaži seznam ukazov</translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation>Skrij seznam ukazov</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation>Po izbiri</translation>
     </message>
     <message>
         <source>Command List</source>
         <translation>Seznam ukazov</translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation>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>
         <source>Hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Pink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pink on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>new session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sessions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To exit fullscreen, tap here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History Lines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konsole </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Izbira ukazov</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation>Dodaj ukaz</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation>Vpiši ukaz, ki naj ga dodam:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/fifteen.ts b/i18n/sl/fifteen.ts
index e2d5d44..c9ebb4d 100644
--- a/i18n/sl/fifteen.ts
+++ b/i18n/sl/fifteen.ts
@@ -1,100 +1,96 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FifteenConfigDialog</name>
     <message>
         <source>All Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select board background</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FifteenConfigDialogBase</name>
     <message>
         <source>Configure Fifteen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use a Custom Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Path:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Preview:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Grid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Rows:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
 <context>
     <name>PiecesTable</name>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Petnajst kosov</translation>
     </message>
     <message>
         <source>Congratulations!
 You win the game!</source>
         <translation>Čestitam!
 Zmagali ste igro!</translation>
     </message>
     <message>
         <source>R&amp;andomize Pieces</source>
         <translation>Z&amp;mešaj kose</translation>
     </message>
     <message>
         <source>&amp;Reset Pieces</source>
         <translation>&amp;Uredi kose</translation>
     </message>
 </context>
 </TS>
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
@@ -1,214 +1,174 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FormatterApp</name>
     <message>
         <source>Formatter</source>
         <translation>Formater</translation>
     </message>
     <message>
         <source>Storage Type</source>
         <translation>Tip skladišča</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <source>Ok</source>
         <translation>Vredu</translation>
     </message>
     <message>
         <source>Formatter Output</source>
         <translation>Izhod formaterja</translation>
     </message>
     <message>
         <source>Trying to umount.</source>
         <translation>Poizkušam odklopiti.</translation>
     </message>
     <message>
         <source>umount failed!</source>
         <translation>odklop ni uspel!</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;Vredu</translation>
     </message>
     <message>
         <source>Could not umount.
 Device is busy!</source>
         <translation>Ne morem odklopiti.
 Naprava je zasedena!</translation>
     </message>
     <message>
         <source>Trying to format.</source>
         <translation>Poizkušam formatirat.</translation>
     </message>
     <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>
         <source>Available: %1 kB ( %d mB)</source>
         <translation>Na voljo: %1 kB ( %d mB)</translation>
     </message>
     <message>
         <source>CAUTION:
 Changing parameters on this
 page may cause your system
 to stop functioning properly!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Format?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 with %1 filesystem?
 You will loose all data!!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Trying to umount %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Trying to mount %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1
 has been successfully mounted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Storage Type: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type: %1
 Formatted with %2
 %3, %4, %5</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,56 +1,52 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GoMainWidget</name>
     <message>
         <source>New Game</source>
         <translation>Nova igra</translation>
     </message>
     <message>
         <source>Pass</source>
         <translation>Naprej</translation>
     </message>
     <message>
         <source>Resign</source>
         <translation>Odstopam</translation>
     </message>
     <message>
         <source>Two player option</source>
         <translation>Dva igralca</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Igra</translation>
     </message>
 </context>
 <context>
     <name>GoWidget</name>
     <message>
         <source>White %1, Black %2. </source>
         <translation>Beli %1, Črni %2</translation>
     </message>
     <message>
         <source>White wins.</source>
         <translation>Beli so zmagal.</translation>
     </message>
     <message>
         <source>Black wins.</source>
         <translation>Črni so zmagal.</translation>
     </message>
     <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
@@ -1,41 +1,37 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HelpBrowser</name>
     <message>
         <source>Backward</source>
         <translation>Nazaj</translation>
     </message>
     <message>
         <source>Forward</source>
         <translation>Naprej</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Domov</translation>
     </message>
     <message>
         <source>Add Bookmark</source>
         <translation>Dodaj zaznamek</translation>
     </message>
     <message>
         <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
@@ -1,68 +1,64 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KBill</name>
     <message>
         <source>kBill</source>
         <translation>kBill</translation>
     </message>
     <message>
         <source>New game</source>
         <translation>Nova igra</translation>
     </message>
     <message>
         <source>Pause game</source>
         <translation>Ustavi igro</translation>
     </message>
     <message>
         <source>Story of kBill</source>
         <translation>Zgodba o kBill</translation>
     </message>
     <message>
         <source>Rules</source>
         <translation>Pravila</translation>
     </message>
     <message>
         <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>
         <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 disguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>UI</name>
     <message>
         <source>After Level</source>
         <translation>Po stopnji</translation>
     </message>
     <message>
         <source>Your score</source>
         <translation>Vaš rezultat</translation>
     </message>
 </context>
 </TS>
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
@@ -1,296 +1,292 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KRFBConnection</name>
     <message>
         <source>Connected</source>
         <translation>Povezan</translation>
     </message>
     <message>
         <source>Connection Refused</source>
         <translation>Povezava zavrnjena</translation>
     </message>
     <message>
         <source>Host not found</source>
         <translation>Ne najdem gostitelja</translation>
     </message>
     <message>
         <source>Read Error: QSocket reported an error reading
 data, the remote host has probably dropped the
 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>
         <source>Protocol Error: An unknown encoding was used by the server %1</source>
         <translation>Napaka prtokola: Strežnik %1 je uporabil neznano kodiranje </translation>
     </message>
     <message>
         <source>Waiting for server initialization...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KRFBLogin</name>
     <message>
         <source>Waiting for server version...</source>
         <translation>Čakam na različico strežnika...</translation>
     </message>
     <message>
         <source>Error: Invalid server version, %1</source>
         <translation>Napaka: Neveljavena različica strežnika, %1</translation>
     </message>
     <message>
         <source>Error: Unsupported server version, %1</source>
         <translation>Napaka: Nepodprta različica strežnika, %1</translation>
     </message>
     <message>
         <source>Logged in</source>
         <translation>Prijavljen</translation>
     </message>
     <message>
         <source>Error: This server requires a password, but none has been specified.
 </source>
         <translation>Napaka: Ta strežnik potrebuje geslo, a nobeno ni bilo podano.
  </translation>
     </message>
     <message>
         <source>Error: The password you specified was incorrect.</source>
         <translation>Napaka: Geslo, ki ste ga posredovali ni pravilno.</translation>
     </message>
     <message>
         <source>Error: Too many invalid login attempts have been made
 to this account, please try later.</source>
         <translation>Napaka: Preveč neveljavnih prijav se je izvršilo
 na ta račun, prosim poizkusite kasneje.</translation>
     </message>
     <message>
         <source>Login Failed</source>
         <translation>Neuspešna prijava</translation>
     </message>
     <message>
         <source>Too many failures</source>
         <translation>Preveč napak</translation>
     </message>
 </context>
 <context>
     <name>KVNC</name>
     <message>
         <source>VNC Viewer</source>
         <translation>VNC Pregledovalnik</translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation>Cel zaslon</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>Prekini povezavo</translation>
     </message>
     <message>
         <source>Stop Full Screen</source>
         <translation>Ustavi cel zaslon</translation>
     </message>
     <message>
         <source>Connected to remote host</source>
         <translation>Povezan z oddaljenim gostiteljem</translation>
     </message>
     <message>
         <source>Logged in to remote host</source>
         <translation>Prijavlen v oddaljenega gostitelja</translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation>Povezava prekinjena</translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation>Nova povezava</translation>
     </message>
     <message>
         <source>Open Bookmark</source>
         <translation>Odpri zaznamek</translation>
     </message>
     <message>
         <source>Delete Bookmark</source>
         <translation>Izbriši zaznamek</translation>
     </message>
     <message>
         <source>Send Contrl-Alt-Delete</source>
         <translation>Pošlji Control-Alt-Delete</translation>
     </message>
     <message>
         <source>Next Click is Double Click</source>
         <translation>Naslednji klik je dvojni klik</translation>
     </message>
     <message>
         <source>Next Click is Right Click</source>
         <translation>Naslednji klik je desni klik</translation>
     </message>
 </context>
 <context>
     <name>KVNCBookmarkDlgBase</name>
     <message>
         <source>Bookmarks</source>
         <translation>Zaznamki</translation>
     </message>
     <message>
         <source>Choose a bookmark that you would like to open</source>
         <translation>Izberite zaznamek, ki bi ga radi odprli</translation>
     </message>
 </context>
 <context>
     <name>KVNCConnDlgBase</name>
     <message>
         <source>VNC Viewer Connection</source>
         <translation>VNC </translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Strežnik</translation>
     </message>
     <message>
         <source>Show Password</source>
         <translation>Prikaži geslo</translation>
     </message>
     <message>
         <source>Password:</source>
         <translation>Geslo:</translation>
     </message>
     <message>
         <source>Bookmark Name:</source>
         <translation>Ime zaznamka:</translation>
     </message>
     <message>
         <source>Host Name:</source>
         <translation>Ime gostitelja:</translation>
     </message>
     <message>
         <source>Display Number:</source>
         <translation>Številka prikazovalnika:</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Izbor</translation>
     </message>
     <message>
         <source>Check for screen updates every:</source>
         <translation>Posodobi zaslon vsakih:</translation>
     </message>
     <message>
         <source>Milliseconds</source>
         <translation>milisekund</translation>
     </message>
     <message>
         <source>Request 8-bit session</source>
         <translation>Zahtevaj 8-bitno sejo</translation>
     </message>
     <message>
         <source>Raise on bell</source>
         <translation>Vstani na zvonec</translation>
     </message>
     <message>
         <source>Request shared session</source>
         <translation>Zahtevaj deljeno sejo</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>4</source>
         <translation>3</translation>
     </message>
     <message>
         <source>Scale Factor</source>
         <translation>Faktor povečave</translation>
     </message>
     <message>
         <source>Encodings</source>
         <translation>Kodiranje</translation>
     </message>
     <message>
         <source>Hextile encoding</source>
         <translation>Hextile kodiranje</translation>
     </message>
     <message>
         <source>CoRRE encoding</source>
         <translation>CoRRE kodiranje</translation>
     </message>
     <message>
         <source>RRE encoding</source>
         <translation>RRE kodiranje</translation>
     </message>
     <message>
         <source>Copy rectangle encoding</source>
         <translation>Kopiraj pravokotno kodiranje</translation>
     </message>
     <message>
         <source>The password of the VNC server</source>
         <translation>Geslo za VNC strežnik</translation>
     </message>
     <message>
         <source>Toggle obscuring the password</source>
         <translation>Vključi/Izključi geslo</translation>
     </message>
     <message>
         <source>The name of the VNC server</source>
         <translation>Ime VNC strežnika</translation>
     </message>
     <message>
         <source>The host name of the VNC server</source>
         <translation>Gostiteljsko ime VNC strežnika</translation>
     </message>
     <message>
         <source>The display number of the VNC server</source>
         <translation>Številko prikazovalnika na VNC strežniku</translation>
     </message>
     <message>
         <source>Delay between requesting updates from the server</source>
         <translation>Zamik med zahtevanjem posodobitev od strežnika</translation>
     </message>
     <message>
         <source>Request that the VNC server transfer 8 bit color</source>
         <translation>Zahtevaj, da VNC strežnik prenaša 8 bitne barve</translation>
     </message>
     <message>
         <source>Allow other users to connect to the VNC server</source>
         <translation>Dovoli drugim uporabnikom, da se priklopijo na VNC strežnik</translation>
     </message>
     <message>
         <source>Scale the remote display to fit on the PDA (Slow)</source>
         <translation>Raztegni oddaljen prikazovalnik, da se prilagodi dlančniku (počasno)</translation>
     </message>
     <message>
         <source>Enable transmiting identical rectangles as references to existing data</source>
         <translation>Vklopi oddajanje identičnih pravokotnikov kot reference za obstoječe podatke</translation>
     </message>
 </context>
 </TS>
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
@@ -1,260 +1,250 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Keys</name>
     <message>
         <source>Ok</source>
         <translation>Vredu</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Privzeto</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Prekliči</translation>
     </message>
     <message>
         <source>Change Direction Keys</source>
         <translation>Zamenjaj smerne tipke</translation>
     </message>
     <message>
         <source>Undefined key</source>
         <translation>Nedefinirana tipka</translation>
     </message>
 </context>
 <context>
     <name>Kpacman</name>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Nova</translation>
     </message>
     <message>
         <source>&amp;Pause</source>
         <translation>&amp;Ustavi</translation>
     </message>
     <message>
         <source>&amp;Hall of fame</source>
         <translation>&amp;Hiša slave</translation>
     </message>
     <message>
         <source>&amp;Quit</source>
         <translation>&amp;Izhod</translation>
     </message>
     <message>
         <source>&amp;Hide Mousecursor</source>
         <translation>&amp;Skrij miškin kazalec</translation>
     </message>
     <message>
         <source>&amp;Select graphic scheme</source>
         <translation>&amp;Izberi grafično shemo</translation>
     </message>
     <message>
         <source>&amp;Pause in Background</source>
         <translation>&amp;Ustavi v ozadju</translation>
     </message>
     <message>
         <source>&amp;Continue in Foreground</source>
         <translation>&amp;Nadaljuj v ospredju</translation>
     </message>
     <message>
         <source>Change &amp;keys...</source>
         <translation>Zamenjaj &amp;tipke...</translation>
     </message>
     <message>
         <source>@PACKAGE@ - @VERSION@
 
 Joerg Thoennissen (joe@dsite.de)
 
 A pacman game for the KDE Desktop
 
 The program based on the source of ksnake
 by Michel Filippi (mfilippi@sade.rhein-main.de).
 The design was strongly influenced by the pacman
 (c) 1980 MIDWAY MFG.CO.
 
 I like to thank my girlfriend Elke Krueers for
 the last 10 years of her friendship.
 </source>
         <translation>@PACKAGE@ - @VERSION@
 
 Joerg Thoennissen (joe@dsite.de)
 
 Pacman za KDE namizje
 
 Program bazira na kodi od ksnake
 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.
 
 Datoteka &apos;@FONTNAME@&apos; ne obstaja
 ali pa je v neznani obliki.</translation>
     </message>
 </context>
 <context>
     <name>Referee</name>
     <message>
         <source>GAME  OVER</source>
         <translation>KONEC IGRE</translation>
     </message>
     <message>
         <source>PLAYER ONE</source>
         <translation>IGRALEC ENA</translation>
     </message>
     <message>
         <source>READY!</source>
         <translation>PRIPRAVLJEN!</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>USTAVLJEN</translation>
     </message>
     <message>
         <source>CHARACTER</source>
         <translation>ZNAK</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>NICKNAME</source>
         <translation>VZDEVEK</translation>
     </message>
     <message>
         <source>-SHADOW</source>
         <translation>-SENCA</translation>
     </message>
     <message>
         <source>&quot;BLINKY&quot;</source>
         <translation>&quot;UTRIPAJOČ&quot;</translation>
     </message>
     <message>
         <source>-SPEEDY</source>
         <translation>-HITRI</translation>
     </message>
     <message>
         <source>&quot;PINKY&quot;</source>
         <translation>&quot;ROŽNAT&quot;</translation>
     </message>
     <message>
         <source>-BASHFUL</source>
         <translation>-BOJEČ</translation>
     </message>
     <message>
         <source>&quot;INKY&quot;</source>
         <translation>&quot;MODER&quot;</translation>
     </message>
     <message>
         <source>-POKEY</source>
         <translation>-POKEY</translation>
     </message>
     <message>
         <source>&quot;CLYDE&quot;</source>
         <translation>&quot;CLYDE&quot;</translation>
     </message>
     <message>
         <source>QTOPIA PORT: CATALIN CLIMOV</source>
         <translation>QTOPIA PORT: CATALIN CLIMOV</translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
         <translation>PRITISNI SMERNO TIPKO ZA ZAČETEK</translation>
     </message>
 </context>
 <context>
     <name>Score</name>
     <message>
         <source>  1UP </source>
         <translation>1IG</translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
         <translation>NAJVIŠJE TOČKE</translation>
     </message>
     <message>
         <source>  2UP </source>
         <translation>2IG</translation>
     </message>
     <message>
         <source>     CONGRATULATIONS      </source>
         <translation>ČESTITAM</translation>
     </message>
     <message>
         <source>    YOU HAVE ARCHIEVED    </source>
         <translation>DOSEGLI STE</translation>
     </message>
     <message>
         <source>  A SCORE IN THE TOP 10.  </source>
         <translation>TOČKE MED 10 NAJBOLJŠIMI.</translation>
     </message>
     <message>
         <source>RNK   SCORE  NAME   DATE</source>
         <translation>MES   TOČKE  IME       DATUM</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>USTAVLJENA</translation>
     </message>
     <message>
         <source>@YY@/@MM@/@DD@</source>
         <translation>@DD@.@MM@.@YY@</translation>
     </message>
     <message>
         <source></source>
         <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>Slike ne morejo biti ustvarjene.
 
 Datoteka &apos;@PIXMAPNAME@&apos; ne obstaja
 ali pa je nezanega formata.</translation>
     </message>
     <message>
         <source>Initialization Error</source>
         <translation>Napaka pri zagonu</translation>
     </message>
 </context>
 </TS>
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
@@ -1,301 +1,278 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DocTabSettings</name>
     <message>
         <source>Enable the Documents Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check, if you want the Documents Tab to be visible.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputMethodSettings</name>
     <message>
         <source>Resize application on Popup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable floating and resizing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check, if you want the application to be automatically resized if the input method pops up.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check, if you want to move and/or resize input methods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Specify the percentage of the screen width for the input method</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherSettings</name>
     <message>
         <source>Launcher Settings</source>
         <translation>Nastavitve zaganjalnika</translation>
     </message>
     <message>
         <source>Taskbar</source>
         <translation>Preklopna vrstica</translation>
     </message>
     <message>
         <source>O-Menu</source>
         <translation>O-menu</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Zavihki</translation>
     </message>
     <message>
         <source>InputMethods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MenuSettings</name>
     <message>
         <source>Load applets in O-Menu:</source>
         <translation>Naloži programčke v O-menu:</translation>
     </message>
     <message>
         <source>Show Launcher tabs in O-Menu</source>
         <translation>Prikaži zaganjalnikove zavihke v O-menuju</translation>
     </message>
     <message>
         <source>Check the applets that you want to have included in the O-Menu.</source>
         <translation>Obkljukajte programčke, ki jih želite imeti v O-menuju.</translation>
     </message>
     <message>
         <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
         <translation>Doda vsebino zaganjalnikovih zavihkov v menu in v O-menu.</translation>
     </message>
     <message>
         <source>Show Applications in Subpopups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Sample 1</source>
         <translation type="unfinished">Primer 1</translation>
     </message>
     <message>
         <source>Sample 2</source>
         <translation type="unfinished">Primer 1</translation>
     </message>
     <message>
         <source>Sample 3</source>
         <translation type="unfinished">Primer 1</translation>
     </message>
 </context>
 <context>
-    <name>SampleView</name>
-    <message>
-        <source>Sample 1</source>
-        <translation type="obsolete">Primer 1</translation>
-    </message>
-    <message>
-        <source>Sample 2</source>
-        <translation type="obsolete">Primer 1</translation>
-    </message>
-    <message>
-        <source>Sample 3</source>
-        <translation type="obsolete">Primer 1</translation>
-    </message>
-</context>
-<context>
     <name>TabDialog</name>
     <message>
         <source>Edit Tab</source>
         <translation>Uredi zavihek</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>Ozadje</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Pisava</translation>
     </message>
     <message>
         <source>Icons</source>
         <translation>Ikone</translation>
     </message>
     <message>
         <source>Previewing %1</source>
         <translation>Predogled %1</translation>
     </message>
     <message>
         <source>This is a rough preview of what the currently selected Tab will look like.</source>
         <translation>To je grob pregled kako bo trenutno izbran zavihek izgledal.</translation>
     </message>
     <message>
         <source>Use a custom font</source>
         <translation>Izberi prirejeno pisavo</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tip:</translation>
     </message>
     <message>
         <source>Ruled</source>
         <translation>Zravnano</translation>
     </message>
     <message>
         <source>Solid color</source>
         <translation>barva</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Slika</translation>
     </message>
     <message>
         <source>Select...</source>
         <translation>Izberi...</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Privzeto</translation>
     </message>
     <message>
         <source>Size:</source>
         <translation>Velikost:</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Majhna</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Velika</translation>
     </message>
     <message>
         <source>Color:</source>
         <translation>Barva:</translation>
     </message>
     <message>
         <source>Columns:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatic</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TabsSettings</name>
     <message>
         <source>Launcher Tabs:</source>
         <translation>Zaganjalnikovi zavihki:</translation>
     </message>
     <message>
         <source>foobar</source>
         <translation>foobar</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nov</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Uredi</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
         <source>Enable big busy indicator</source>
         <translation>Vklopi velik kazalnik zasedenosti</translation>
     </message>
     <message>
-        <source>Enable blinking busy indicator</source>
-        <translation 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>
         <source>Not implemented yet</source>
         <translation>Še ni implementirano</translation>
     </message>
     <message>
         <source>Enable animated busy indicator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Activate this, if you want an animatedbusy indicator for starting applications in the Launcher.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable static background pixmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Activate this, if you want the background pixmap not to scroll with the icons.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskbarSettings</name>
     <message>
         <source>Load applets in Taskbar:</source>
         <translation>Naloži programčke v opravilno vrstico:</translation>
     </message>
     <message>
         <source>Check the applets that you want displayed in the Taskbar.</source>
         <translation>Obkljukajte programčke, ki jih želite v opravilni vrstici.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/libbatteryapplet.ts b/i18n/sl/libbatteryapplet.ts
index 6e4576c..ff53425 100644
--- a/i18n/sl/libbatteryapplet.ts
+++ b/i18n/sl/libbatteryapplet.ts
@@ -1,106 +1,86 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BatteryStatus</name>
     <message>
         <source>Charging</source>
         <translation>Polnim</translation>
     </message>
     <message>
         <source>Battery status: </source>
         <translation>Status baterije:</translation>
     </message>
     <message>
         <source>Good</source>
         <translation>Dober</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Nizek</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>Zelo nizek</translation>
     </message>
     <message>
         <source>Critical</source>
         <translation>Kritičen</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Neznan</translation>
     </message>
     <message>
         <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>
         <source>Remaining Power: %1%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remaining Time: %1m %2s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remaing Power: %1 %2
 Remaining Time: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ipaq  %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,198 +1,76 @@
 <!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>
     </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="unfinished">&lt;p&gt;Sprejeli ste datoteko tipa %1 (&lt;img src=&quot;%2&quot;&gt; ) Kaj želite narediti?</translation>
     </message>
 </context>
 <context>
     <name>OpieObex::SendWidget</name>
     <message>
         <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
         <translation type="unfinished">&lt;qt&gt;&lt;h1&gt;Pošiljam:&lt;/h1&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Done</source>
         <translation type="unfinished">Končano</translation>
     </message>
     <message>
         <source>IrDa is not enabled!</source>
         <translation type="unfinished">IrDa ni vklopljen!</translation>
     </message>
     <message>
         <source>Searching for IrDa Devices.</source>
         <translation type="unfinished">Iščem IrDa naprave.</translation>
     </message>
     <message>
         <source>Bluetooth is not available</source>
         <translation type="unfinished">Bluetooth ni na voljo</translation>
     </message>
     <message>
         <source>Searching for bluetooth Devices.</source>
         <translation type="unfinished">Iščem bluetooth naprave.</translation>
     </message>
     <message>
         <source>Scheduling for beam.</source>
         <translation type="unfinished">Razvrščam za prežarčenje.</translation>
     </message>
     <message>
         <source>Click to beam</source>
         <translation type="unfinished">Klikni za prežarčenje</translation>
     </message>
     <message>
         <source>Sent</source>
         <translation type="unfinished">Poslano</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation type="unfinished">Napaka</translation>
     </message>
     <message>
         <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
@@ -1,756 +1,602 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>OPimRecurrenceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished">Ponavljajoč dogodek
 </translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Brez</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">Dan</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished">Teden</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished">Mesec</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished">Leto</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished">Vasak:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished">Pogostost</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished">Konča na:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">Brez končnega datuma</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">Ponovi na</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">Pon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">Tor</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">Sre</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">Čet</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">Pet</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">Sob</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">Ned</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">Vsak</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished">Spremenljivka1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished">Spremenljivka 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished">Tedenskaspremenljivka</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">Brez končnega datuma</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">Ponovi na</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">Pon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">Tor</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">Sre</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">Čet</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">Pet</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">Sob</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">Ned</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">Dan</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">Vsak</translation>
     </message>
 </context>
 <context>
-    <name>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>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to edit the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to duplicate the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to delete the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to transmit the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</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>QObject</name>
     <message>
         <source>Priority:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Very high</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Very low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Children: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">Vsak</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 %2 of every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation type="unfinished"></translation>
     </message>
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,318 +1,175 @@
 <!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>
     </message>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished"></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="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>QObject</name>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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>
 </TS>
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
@@ -1,1049 +1,992 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation>Vse</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Neizpolnjeno</translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation>(več.)</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Poslovno</translation>
     </message>
     <message>
         <source>Personal</source>
         <translation>Osebno</translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation>(Več.)</translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation>Vse</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>Nova kategorija</translation>
     </message>
     <message>
         <source>New Category </source>
         <translation>Nova kategorija</translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation>Uredi kategorijo</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>Kategorije</translation>
     </message>
     <message>
         <source>Application</source>
         <translation>Aplikacija</translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation>Kategorije gredo sem</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Dodaj</translation>
     </message>
     <message>
         <source>Global</source>
         <translation>Globalno</translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation>Obkljukajte kategorije katerim ta dokument pripada.</translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation>Tu vnesite novo kategorijo. Pritisnite &lt;b&gt;Dodaj&lt;/b&gt;, da dodate v seznam.</translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation>Vnesite novo kategorijo levo in pritisnite dodaj, da dodate v seznam.</translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation>Pritisnite, da izbrišete osvetljeno kategorijo.</translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation>Obkljukajte, da naredite to lastnost dostopno vsem programom.</translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation>Vse</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Neizpolnjeno</translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation>Napaka</translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation>Oprostite, že neka druga aplikacija
 ureja kategorije.</translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation>Uredi kategorije</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Vse</translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation>Prikaži januar v izbranem letu</translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation>Prikaži prejšni mesec</translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation>Prikaži naslednji mesec</translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation>Prikaži december v izbranem letu</translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation>Zapri Izbiralca datotek</translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation>Prikaži dokumente tega tipa</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Pogled dokumenta</translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation>Prikaži dokumente v tej kategoriji</translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation>Obkljukajte, da izberete dokument iz seznama</translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation>ali pa izberite &lt;b&gt;Nov dokument&lt;/b&gt;, da ustvarite nov dokument.</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation>&lt;br&gt;&lt;br&gt;Kliknite in zadržite za lastnosti dokumenta.</translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation>Ime</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <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>
         <source>Find what:</source>
         <translation>Najdi kaj:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorija:</translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation>Začni iskati:</translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation>Dec 02 01</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Loči velike in male črke</translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation>Išči nazaj</translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Document View</source>
         <translation>Pogled dokumenta</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation>Izbris datoteke spodletel.</translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation>Kopija</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplikat</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>Kopiranje datoteke spodletelo.</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Podrobnosti</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>Premikanje dokumenta spodletelo.</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Trdi disk</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Lastnosti</translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation>Podrobnosti</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>Komentar:</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tip:</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Ime:</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Lokacija:</translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation>Hitro nalaganje (vzame nekaj spomin)</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Kopiraj</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Prežarči</translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation>Medij na katerem je dokument.</translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation>Ime tega dokumenta.</translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation>Prednaloži ta program tako, da je takoj na voljo.</translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation>Izbriši ta dokument.</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation>Naredi kopijo tega dokumenta.</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation>Prežarči ta dokument na drugo napravo.</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation>Uporabi prilagojen zasuk</translation>
     </message>
     <message>
         <source>Arguments:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>Informacije o lastniku</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Vredu</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Vpiši geslo</translation>
     </message>
 </context>
 <context>
     <name>QMessageBox</name>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Zmanjkalo prostora</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>Prišlo je do problema pri ustvarjenju
 nastavitvene informacije
 za ta program.
 
 Prosim sprostite nekaj prostora in
 poizkusite ponovno.</translation>
     </message>
     <message>
         <source>Unable to create start up files
 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>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Domači naslov:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation>Epoštni naslovi: </translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Domači telefon: </translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Domači faks: </translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Domači mobitel: </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Domača spletna stran: </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Službena spletna stran: </translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Pisarna: </translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Službeni telefon: </translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Službeni faks: </translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Službeni mobitel: </translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Službeni pager: </translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Poklic: </translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Pomočnik: </translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Upravnik: </translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Moški</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Ženska</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Spol: </translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Sopotnik: </translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Rojstni dan: </translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Obletnica: </translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Vzdevek: </translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Imenski naziv</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Ime</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Medimek</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Priimek</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Pripona</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Datoteka kot</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Naziv službenega mesta</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Oddelek</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Podjetje</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Službeni telefon</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Službeni faks</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Službeni mobitel</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>Privzeta Epošta</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>Epošta</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Domači telefon</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Domači faks</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Domači mobitel</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Ulica službe</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Mesto službe</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>Okrožje službe</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>Službena poštna številka</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>Država službe</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Službeni pager</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Službena spletna stran</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Pisarna</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Poklic</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Pomočnik</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Upravnik</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Domač naslov</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Domče mesto</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>Domače okrožje</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>Domača poštna številka</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>Domača država</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Domača spletna stran</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Sopotnik</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Spol</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Rojstni dan</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Obletnica</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Vzdevek</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Otroci</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Zapiski</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Skupine</translation>
     </message>
     <message>
         <source>New Document</source>
         <translation>Nov dokument</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Pon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Tor</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Sre</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Čet</translation>
     </message>
     <message>
         <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>
     <message>
         <source>Jan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>May</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jul</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oct</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nov</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation type="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>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maximize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>CF kartica</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Trdi disk</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>SD kartica</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>SCSI trdi disk</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Notranja shramba</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>Notranji spomin</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>MMC kartica</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>Brez</translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation>program citytime ni najden</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation>Če želite izbrati časovni pas,
 prosim naložite citytime.</translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Zmanjkalo prostora</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Ne morem izvršiti alarma.
 Prosim sprostite malo prostora in poizkusite ponovno</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>%1 datotek</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>%1 %2</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>Vseh %1 datotek</translation>
     </message>
     <message>
         <source>All files</source>
         <translation>Vse datoteke</translation>
     </message>
 </context>
 <context>
     <name>WindowDecoration</name>
     <message>
         <source>Default</source>
         <comment>List box text for default window decoration</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,48 +1,36 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MindBreaker</name>
     <message>
         <source>New Game</source>
         <translation>Nova igra</translation>
     </message>
     <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>
         <source>Cancel</source>
         <translation>Prekliči</translation>
     </message>
 </context>
 </TS>
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,37 +1,33 @@
 <!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>
         <source>Game</source>
         <translation>Igra</translation>
     </message>
     <message>
         <source>Mine Sweep</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,300 +1,328 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BaseSetup</name>
     <message>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slideshow timeout:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Toggle autoscale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to next image</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Delete Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Image Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></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>Browser Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Keyboard Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie Eye - Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Imageinfo Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Imageview Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Go dir up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start slideshow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and Imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show images fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto rotate images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show images unscaled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show zoomer window when unscaled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
     <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>
         <source>&lt;center&gt;&lt;b&gt;Be carefull with the following options!&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show files recursive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recursion depth:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Digital Camera View</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Name Only</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>imageinfo</name>
     <message>
         <source>View Full Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays an thumbnail of the image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays info of selected image</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,817 +1,878 @@
 <!DOCTYPE TS><TS>
 <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>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerUI</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposeMail</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please create an SMTP account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a File.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Store message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Store message into drafts?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Attachments will not be stored in &quot;Draft&quot; folder&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Receiver specified</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposeMailUI</name>
     <message>
         <source>Compose Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>send later</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>use:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BCC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <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>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>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete the selected Account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select an account.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccountsUI</name>
     <message>
         <source>Configure Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>News</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IMAPconfigUI</name>
     <message>
         <source>Configure IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefix</source>
         <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>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>
     </message>
     <message>
         <source>Send queued mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show/Hide folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Newsgroups</source>
         <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>
     </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>
 <context>
     <name>NNTPconfigUI</name>
     <message>
         <source>Configure NNTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Newsgroup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get newsgroup list from server</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Newmdirdlgui</name>
     <message>
         <source>Enter directory name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directory name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directory contains other subdirs</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <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>
     </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>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></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>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec imapd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>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>
     </message>
     <message>
         <source>Use Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the SMTP Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port of the SMTP Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SelectMailTypeUI</name>
     <message>
         <source>Select Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Account Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>POP3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SMTP</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SettingsDialogUI</name>
     <message>
         <source>Settings Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View mail as Html</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compose Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mails later ( enqueue in outbox )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></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>
     </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>
     </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>
     </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>
     </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>
     </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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Store mail(s) to&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Folder:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create new folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefix will prepend, no need to enter it!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move mail(s)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,97 +1,73 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CanvasCardWindow</name>
     <message>
         <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>
         <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>
         <source>Snap to position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Turn one card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Turn three cards</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -21,405 +21,393 @@
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation type="unfinished"></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>
 <context>
     <name>FirstUse</name>
     <message>
         <source>&lt;&lt; Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next &gt;&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap anywhere on the screen to continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait, loading %1 settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finish</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputMethods</name>
     <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>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>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>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>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scan whole media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation type="unfinished"></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>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Server</name>
     <message>
         <source>USB Lock</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Critical Memory Shortage
 Please end this application
 immediately.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WARNING</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The battery is running very low. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The Back-up battery is very low&lt;p&gt;Please charge the back-up battery</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Shutdown...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Allow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade or change the security setting to use IntelliSync.</source>
         <translation type="unfinished"></translation>
     </message>
     <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
@@ -1,388 +1,244 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoginBase</name>
     <message>
         <source>LoginBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you select this option, opie-login will automagically log you in with the user you have selected in the drop-down list.  
 
 For the Zaurus 5x00 this is always the user &quot;root&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This drop-down list allows you to select the user for auto-login
 (if enabled above).  
 
 You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MultiauthConfig</name>
     <message>
         <source>Security configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the order they will appear in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
         <source>Locking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></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-securityplugin-*&lt;/em&gt; package! Once you have done that, you will be able to configure your PDA protection here.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MultiauthGeneralConfig</name>
     <message>
         <source>When to lock Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on Opie start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on Opie resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Multiple plugins authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Required successes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Don&apos;t protect this config screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show explanatory screens</source>
         <translation type="unfinished"></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>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You must save your current settings before trying to authenticate. Press OK to accept and launch a simulated authentication process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you don&apos;t like the result of this test, don&apos;t forget to change your settings before you exit the configuration application!</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>
     </message>
     <message>
         <source>Select a net-range or enter a new one.  
 
 This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
 
 For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
 
 The entry &quot;All&quot; will allow *any* IP to connect. 
 The entry &quot;None&quot; will *deny* any connection.  
 
 If unsure, select &quot;Any&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the selected net range from the list
 
 If you press this button, the currently selected net range will be deleted from the list of net ranges.
 
 If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
 the list to the state it has been when you initially booted your Zaurus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button will restore the list of net ranges
 to the defaults.
 
 Beware that all manually entered net ranges will be lost!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select your sync software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Qtopia 1.7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie 1.0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IntelliSync</source>
         <translation type="unfinished"></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="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,51 +1,43 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>SnakeGame</name>
     <message>
         <source>Snake</source>
         <translation>Kača</translation>
     </message>
     <message>
         <source>New Game</source>
         <translation>Nova igra</translation>
     </message>
     <message>
         <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
@@ -1,357 +1,353 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tests</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSysInfo</name>
     <message>
         <source>CF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ha</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>In</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RA</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Uporaba CPE v aplikacijah (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>Uporaba CPE v sistemu (%)</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Type: </translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Uporabljeno (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Medpomnilniki (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Predpomneno (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Prosto (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Skupen spomin: %1 kB</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Modul</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Velikost</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Uporabi#</translation>
     </message>
     <message>
-        <source>Used By</source>
-        <translation type="obsolete">Uporablja ga</translation>
-    </message>
-    <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished">Pošlji</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Uporabljeno (%1 kB)</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>Na voljo (%1 kB)</translation>
     </message>
     <message>
         <source> : %1 kB</source>
         <translation>: %1 kB</translation>
     </message>
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Ukaz</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Čas</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished">Pošlji</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Really want to send %1
 to this process?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>Informacija o sistemu</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Spomin</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Pomnilnik</translation>
     </message>
     <message>
         <source>CPU</source>
         <translation>CPE</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Proces</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Različica</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>Moduli</translation>
     </message>
     <message>
         <source>Benchmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syslog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Linux jedro&lt;/b&gt;&lt;p&gt;Različica: </translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Prevedel: </translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Različica: </translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Zgrajeno na: </translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;Model: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;Vendor: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Built against Qt/E </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,69 +1,58 @@
 <!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>
     <message>
         <source>TableViewer - Edit Keys</source>
         <translation>PregledovalnikTabel - Uredi ključe</translation>
     </message>
     <message>
         <source>Key Name</source>
         <translation>Ime ključa</translation>
     </message>
     <message>
         <source>Key Type</source>
         <translation>Tip ključa</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nov</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
         <source>Clear All</source>
         <translation>Zbriši vse</translation>
     </message>
 </context>
 <context>
     <name>TVListView</name>
     <message>
         <source>List View</source>
         <translation>Pogled seznama</translation>
     </message>
 </context>
 <context>
     <name>TableViewerWindow</name>
     <message>
         <source>Table Viewer</source>
         <translation>Pregledovalnik tabel</translation>
     </message>
     <message>
         <source>could not load Document</source>
         <translation>ne uspem naložiti Dokumenta</translation>
     </message>
 </context>
 </TS>
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
@@ -1,600 +1,540 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;h1&gt;Alarm at %1&lt;/h1&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished">Neizpolnjeno</translation>
     </message>
 </context>
 <context>
     <name>NewTaskDlg</name>
     <message>
         <source>New Task</source>
         <translation type="unfinished">Novo opravilo</translation>
     </message>
     <message>
         <source>Blank task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Using template:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recurrence</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Task Editor</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie</name>
     <message>
         <source>Todo List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Task</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished">Uredi opravilo</translation>
     </message>
     <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>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to set the priority of new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter description of new task here.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>More</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to enter additional information for new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to reset new task information.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data can not be edited, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data can&apos;t be edited, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>Table View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter brief description of the task here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Complete </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work on </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Buy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Organize </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plan </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Call </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select priority of task here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Very High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select category to organize this task with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recurring task</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information about this task here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Summary:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorStatus</name>
     <message>
         <source>Status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to set the current status of this task.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select progress made on this task here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>40 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>60 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>80 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>100 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to set the date this task was started.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Due Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to set the date this task needs to be completed by.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to mark this task as completed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to set the date this task was completed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintainer Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to set the maintainer&apos;s role.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nothing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Done By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintainer:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is the name of the current task maintainer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the task maintainer.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,832 +1,566 @@
 <!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>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <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>
         <source>&amp;Import text file</source>
         <translation>Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
         <translation>Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
         <translation>&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation 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>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation 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>
         <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
         <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
         <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
         <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
         <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
         <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
         <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
         <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
         <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
         <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
         <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
         <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
         <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
         <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
         <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
         <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
-        <source>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>
         <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No document defined.
 You have to create a new document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to save </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 before continuing?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Now you have to enter
 a password twice for your
 newly created document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&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>
         <source>&lt;P&gt;You must create a new document first. Ok to create?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Password Manager&lt;br&gt;ZSafe version 2.1.2&lt;br&gt;&lt;/b&gt;by Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Translations by Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,561 +1,481 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Pick</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>AbView</name>
     <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>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %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>
         <source>Unable to save information.
 Free up some space
 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>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Configuration</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Query Style</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Order</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click on tab to select one</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>If selected, search differs between upper and lower chars</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Font size for list- and card view</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Move selected attribute one line up</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tool-/Menubar</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Switch to fixed menu-/toolbars after restarting application !</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Moveable</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Switch to moveable menu-/toolbars after restarting application !</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Full Name...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>General</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>City</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>State</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Angola</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Australia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Austria</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Belize</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Benin</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Brazil</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Bulgaria</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Burkina Faso</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Burundi</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Chad</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Chile</source>
         <translation>FOO</translation>
     </message>
@@ -1002,552 +922,385 @@ is provided free !</source>
     <message>
         <source>Puerto Rico</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Qatar</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Reunion</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Romania</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Russia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Rwanda</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Saint Lucia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Samoa</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>San Marino</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Senegal</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Seychelles</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sierra Leone</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Singapore</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Slovakia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Slovenia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Solomon Islands</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Somalia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>South Africa</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Spain</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sri Lanka</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>St. Helena</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sudan</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Suriname</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Swaziland</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sweden</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Switzerland</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Taiwan</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tajikistan</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tanzania</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Thailand</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Togo</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tokelau</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tonga</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tunisia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Turkey</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Turkmenistan</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Afghanistan</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Antarctica</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Armenia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Bolivia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cameroon</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Ghana</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Guadeloupe</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Guinea-Bissau</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Jamaica</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Kiribati</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Kyrgyzstan</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Vietnam</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Press to enter last- middle and firstname</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter fullname directly ! If you have a lastname with multiple words ( for instance &quot;de la Guerra&quot;), please write &lt;lastname&gt;,&lt;firstnames&gt; like this: &quot;de la Guerra, Carlos Pedro&quot;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The working place of the contact</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Press to select attribute to change</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Press to select how to store the name (and howto show it in the listview)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie</name>
     <message>
         <source>Contact</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <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,428 +1,358 @@
 <!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>
         <source>Open as text</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Run Command</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>File Info</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>AdvancedFm</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>File</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>View</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select All</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>FOO</translation>
     </message>
     <message>
         <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>
         <source>Switch to View 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not Yet Implemented</source>
         <translation type="unfinished"></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>
         <source>Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1 files?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1 and all it&apos;s contents?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really copy %1 files?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 already  exists. Ok to overwrite?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Could not copy %1 to %2&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy %1 As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt; %1 already exists. Ok to overwrite?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not copy %1 to %2&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt; %1 already exists. Do you really want to delete it?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not move %1&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not copy %1 to %2&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Output</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Save output to file (name only)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Process could not start</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>
 Finished
 </source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>group</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>others</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>read</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>write</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>filePermissions</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,278 +1,220 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Appearance</name>
     <message>
         <source>Settings...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation>FOO</translation>
     </message>
     <message>
         <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>
         <source>Drop down list</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Top</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Style</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Windows</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Restart</source>
-        <translation 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>
         <source>Window decorations control the way the application title bar and its buttons appear.
 
 Click here to select an available decoration.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select the desired name, style and size of the default font applications will use.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Color schemes are a collection of colors which are used for various parts of the display.
 
 Click here to select an available scheme.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <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>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Appearance Settings</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Rotation direction:</source>
         <translation>FOO</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>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Normal Item</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Disabled Item</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Normal Text</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Highlighted Text</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Button</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Check Box</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sample window using the selected settings.</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
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
@@ -1,688 +1,648 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select one or more groups</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Remove
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>All</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Save output</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>Ipkg</name>
     <message>
         <source>Dealing with package %1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Removing symbolic links...
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Creating symbolic links for %1.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Creating symbolic links for %1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Removing status entry...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>status file - </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>package - </source>
         <translation>FOO</translation>
     </message>
     <message>
         <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>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Find next</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>View</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Packages</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 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>FOO</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Are you sure you wish to delete
 %1?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Download to where</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter path to download to</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Install Remote Package</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter package location</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Nothing to do</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No packages selected</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Do you wish to remove or reinstall
 %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>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Package Information</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Package information is unavailable</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Installed packages</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Local packages</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>N/A</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Package - %1
               version - %2</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>
               inst version - %1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Version string is empty.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Epoch in version is not number.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Nothing after colon in version number.</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>QuestionDlg</name>
     <message>
         <source>Remove</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Servers</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Address:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Active Server</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Update</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Link to root</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Username:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Password:</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
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,168 +1,148 @@
 <!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>
     <message>
         <source>Backup Failed!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <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>
         <source>Restore Backup...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;%1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Would you really overwrite your local data?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <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>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ErrorDialog</name>
     <message>
         <source>Error Info</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error Message:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
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,339 +1,331 @@
 <!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>
         <source>CE</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>log</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>ln</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>(</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>sin</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>cos</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>tan</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>%</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>+/-</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>3</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>6</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>=</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>0</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>-</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>x</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>4</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>8</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>/</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>+</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>5</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>7</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>9</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>2</source>
         <translation>FOO</translation>
     </message>
     <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>
         <source>Distance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>acres</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&#xb0;C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>carats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&#xb0;F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>fl oz (US)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>g</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>gal (US)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>hectares</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>km</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>l</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>lb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lg tons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ml</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>naut. mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>oz</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>pt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>qt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq km</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq yd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>St tons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tblspoon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>teaspoons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tonnes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>yd</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,735 +1,631 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Info</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Charts</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Savings</source>
-        <translation 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>
         <source>Enter account number for this checkbook here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Current balance: %10.00</source>
-        <translation 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>
     </message>
     <message>
         <source>Description</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Amount</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Draw</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Current balance: %1%2</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Enter password</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sort by:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select checkbook sorting here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entry Order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SortDate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Balance</source>
         <translation type="unfinished">FOO</translation>
     </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Account Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Account Types</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Payees</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open last checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether the last open checkbook will be opened at startup.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show last checkbook tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save new description as payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to save new descriptions in the list of payess.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ListEdit</name>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">FOO</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>Date</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Savings</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Checking</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>CD</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Money market</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Other</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Electronics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation type="unfinished">FOO</translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Number:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Automobile</source>
-        <translation 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
@@ -1,286 +1,206 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AlarmDlg</name>
     <message>
         <source>Clock</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Snooze</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AlarmDlgBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>TextLabel1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Snooze</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thu</source>
         <comment>Thursday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fri</source>
         <comment>Friday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat</source>
         <comment>Saturday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sun</source>
         <comment>Sunday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lap/Split</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Daily Alarm:&lt;/b&gt;&lt;p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily alarm requires at least
 one day to be selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished">FOO</translation>
     </message>
 </context>
 <context>
     <name>ClockBase</name>
     <message>
         <source>Clock</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stopwatch</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Split</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Starts and stops the stopwatch.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lap/Split</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Resets the stopwatch.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check to enable the daily alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the hour the alarm will sound.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the minute the alarm will sound.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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
@@ -1,854 +1,823 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Continue</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>error box</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>T</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>W</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>F</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>S</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>This is an all day event.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>End</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> - </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Beam this occurence</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Views</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Week List</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Time display</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>None</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>FOO</translation>
     </message>
+    <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>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
         <translation type="unfinished">FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstEvent</name>
     <message>
         <source>Edit</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished">FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>2</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation>FOO</translation>
     </message>
-    <message>
-        <source>Mo</source>
-        <comment>Monday</comment>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Tu</source>
-        <comment>Tuesday</comment>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>We</source>
-        <comment>Wednesday</comment>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Th</source>
-        <comment>Thursday</comment>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Fr</source>
-        <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>
         <source>Calendar</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start time</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>FOO</translation>
     </message>
-    <message>
-        <source>Start Time</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>End</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>th</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>days</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>day</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>week</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>month</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>year</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> and </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>, and </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>on </source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>None</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>FOO</translation>
     </message>
     <message>
         <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>Every</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>months</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>years</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
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,313 +1,249 @@
 <!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>
         <source>Cyan on White</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>FOO</translation>
     </message>
     <message>
         <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>
         <source>Tab</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>FOO</translation>
     </message>
     <message>
         <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>
         <source>ScrollBar</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Use Beep</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>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>
         <source>Hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Pink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pink on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>new session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sessions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To exit fullscreen, tap here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History Lines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konsole </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
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
@@ -1,99 +1,95 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FifteenConfigDialog</name>
     <message>
         <source>All Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select board background</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FifteenConfigDialogBase</name>
     <message>
         <source>Configure Fifteen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use a Custom Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Path:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Preview:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Grid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Rows:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
 <context>
     <name>PiecesTable</name>
     <message>
         <source>Fifteen Pieces</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Congratulations!
 You win the game!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>R&amp;andomize Pieces</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Reset Pieces</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
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
@@ -1,201 +1,167 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FormatterApp</name>
     <message>
         <source>Formatter</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Storage Type</source>
         <translation>FOO</translation>
     </message>
     <message>
         <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>
     <message>
         <source>Ok</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Formatter Output</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Trying to umount.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>umount failed!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Could not umount.
 Device is busy!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Trying to format.</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>
     </message>
     <message>
         <source>CAUTION:
 Changing parameters on this
 page may cause your system
 to stop functioning properly!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Format?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>
 with %1 filesystem?
 You will loose all data!!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Trying to umount %1.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Trying to mount %1.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>%1
 has been successfully mounted.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Storage Type: %1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Type: %1
 Formatted with %2
 %3, %4, %5</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
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
@@ -1,56 +1,52 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GoMainWidget</name>
     <message>
         <source>New Game</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Pass</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Resign</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Two player option</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>GoWidget</name>
     <message>
         <source>White %1, Black %2. </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>White wins.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Black wins.</source>
         <translation>FOO</translation>
     </message>
     <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
@@ -1,68 +1,64 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KBill</name>
     <message>
         <source>kBill</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New game</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Pause game</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Story of kBill</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Rules</source>
         <translation>FOO</translation>
     </message>
     <message>
         <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>
         <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 disguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>UI</name>
     <message>
         <source>After Level</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Your score</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
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
@@ -1,292 +1,288 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KRFBConnection</name>
     <message>
         <source>Connected</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Connection Refused</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Host not found</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Read Error: QSocket reported an error reading
 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>
         <source>Protocol Error: An unknown encoding was used by the server %1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Waiting for server initialization...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KRFBLogin</name>
     <message>
         <source>Waiting for server version...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error: Invalid server version, %1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error: Unsupported server version, %1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Logged in</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error: This server requires a password, but none has been specified.
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error: The password you specified was incorrect.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error: Too many invalid login attempts have been made
 to this account, please try later.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Login Failed</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Too many failures</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>KVNC</name>
     <message>
         <source>VNC Viewer</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Open Bookmark</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete Bookmark</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Send Contrl-Alt-Delete</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Next Click is Double Click</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Next Click is Right Click</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Stop Full Screen</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Connected to remote host</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Logged in to remote host</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>KVNCBookmarkDlgBase</name>
     <message>
         <source>Bookmarks</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Choose a bookmark that you would like to open</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>KVNCConnDlgBase</name>
     <message>
         <source>VNC Viewer Connection</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The password of the VNC server</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show Password</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Toggle obscuring the password</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Password:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The name of the VNC server</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Bookmark Name:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The host name of the VNC server</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Host Name:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Display Number:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The display number of the VNC server</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Request shared session</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Allow other users to connect to the VNC server</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Request 8-bit session</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Request that the VNC server transfer 8 bit color</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delay between requesting updates from the server</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>2</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>4</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Scale the remote display to fit on the PDA (Slow)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Scale Factor</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Milliseconds</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Raise on bell</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Check for screen updates every:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Encodings</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Hextile encoding</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>CoRRE encoding</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>RRE encoding</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Copy rectangle encoding</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enable transmiting identical rectangles as references to existing data</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
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
@@ -1,286 +1,278 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DocTabSettings</name>
     <message>
         <source>Enable the Documents Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check, if you want the Documents Tab to be visible.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputMethodSettings</name>
     <message>
         <source>Resize application on Popup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable floating and resizing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check, if you want the application to be automatically resized if the input method pops up.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check, if you want to move and/or resize input methods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Specify the percentage of the screen width for the input method</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherSettings</name>
     <message>
         <source>Launcher Settings</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Taskbar</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>O-Menu</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>InputMethods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MenuSettings</name>
     <message>
         <source>Load applets in O-Menu:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show Launcher tabs in O-Menu</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Check the applets that you want to have included in the O-Menu.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show Applications in Subpopups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Sample 1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sample 2</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sample 3</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>TabDialog</name>
     <message>
         <source>Edit Tab</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Icons</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Previewing %1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This is a rough preview of what the currently selected Tab will look like.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Use a custom font</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Ruled</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Solid color</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Size:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Color:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Columns:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatic</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TabsSettings</name>
     <message>
         <source>Launcher Tabs:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>foobar</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enable big busy indicator</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Enable blinking busy indicator</source>
-        <translation 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>
         <source>Not implemented yet</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enable animated busy indicator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Activate this, if you want an animatedbusy indicator for starting applications in the Launcher.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable static background pixmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Activate this, if you want the background pixmap not to scroll with the icons.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskbarSettings</name>
     <message>
         <source>Load applets in Taskbar:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Check the applets that you want displayed in the Taskbar.</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/libbatteryapplet.ts b/i18n/xx/libbatteryapplet.ts
index d3a994e..ba37eb5 100644
--- a/i18n/xx/libbatteryapplet.ts
+++ b/i18n/xx/libbatteryapplet.ts
@@ -1,110 +1,86 @@
 <!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>
         <source>Very Low</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Critical</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>FOO</translation>
     </message>
     <message>
         <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>
         <source>Remaining Power: %1%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remaining Time: %1m %2s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remaing Power: %1 %2
 Remaining Time: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ipaq  %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,26 +1,17 @@
 <!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>
 </TS>
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,1168 +1,726 @@
 <!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>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished">FOO</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>month(s)</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>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to edit the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to duplicate the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to delete the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to transmit the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</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>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Office: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>FOO</translation>
     </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>
         <source>Home Mobile: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Children: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>End:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Note:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>The %1 %1 of every</source>
-        <translation 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>
         <source>Wednesday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>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>
         <source>Low</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
-        <translation 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>
         <source>User Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profession</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Has a due-date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No due-date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No reccurrence</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No start-date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No completed-date</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>th</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/libopieui2.ts b/i18n/xx/libopieui2.ts
index 47149da..a6f9c13 100644
--- a/i18n/xx/libopieui2.ts
+++ b/i18n/xx/libopieui2.ts
@@ -1,844 +1,175 @@
 <!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>
     </message>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished">FOO</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished">FOO</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished">FOO</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished"></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="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
@@ -1,1022 +1,981 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Personal</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New Category </source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Application</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Global</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>All</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <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>
         <source>Find what:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Properties</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Arguments:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>2</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>3</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>4</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>5</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>6</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>7</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>8</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>9</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>0</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>QMessageBox</name>
     <message>
         <source>Yes</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>New Document</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>FOO</translation>
     </message>
     <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>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Office: </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>Profession: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Company</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>Default Email</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>FOO</translation>
     </message>
     <message>
         <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>
     <message>
         <source>Jan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>May</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jul</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oct</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nov</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation type="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>
     <message>
         <source>%1 document</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Click to make this window movable.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maximize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>FOO</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>All files</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>WindowDecoration</name>
     <message>
         <source>Default</source>
         <comment>List box text for default window decoration</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,113 +1,101 @@
 <!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>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> days: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enable/Disable Views</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show &amp;Birthdays</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show &amp;Anniveraries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The next birthdays will just be shown, if enabled!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The next anniversaries will just be shown, if enabled !</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>AddressBook plugin</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/libtodaydatebookplugin.ts b/i18n/xx/libtodaydatebookplugin.ts
index 524b0ce..e30a8e5 100644
--- a/i18n/xx/libtodaydatebookplugin.ts
+++ b/i18n/xx/libtodaydatebookplugin.ts
@@ -1,142 +1,87 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <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>
     </message>
     <message>
         <source>Show notes</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Show only later appointments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Show time in extra line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>How many appointment should be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>only today</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>How many more days should be in the range</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>How many more days</source>
         <translation type="unfinished">FOO</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Datebook plugin</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
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
@@ -1,59 +1,40 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>Todolist plugin</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>TodoPluginConfigBase</name>
     <message>
         <source>Set the maximum number of task that should be shown</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>tasks shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
         <translation type="unfinished">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
@@ -1,120 +1,116 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>Weather plugin</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>WeatherPluginConfig</name>
     <message>
         <source>Enter ICAO location identifier:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter the 4 letter code for the desired location here.  See http://www.nws.noaa.gov/tg/siteloc.shtml to find a location near you.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Visit http://www.nws.noaa.gov/tg/siteloc.shtml to find the nearest location.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Use metric units</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to select type of units displayed.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Update frequency (in minutes):</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select how often (in minutes) you want the weather to be updated.</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>WeatherPluginWidget</name>
     <message>
         <source>Retreiving current weather information.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Temp: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>  Wind: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>
 Pres: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Current weather data not available.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>n/a</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>E </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>NE </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>N </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>NW </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>W </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>SW </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>S </source>
         <translation>FOO</translation>
     </message>
     <message>
         <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
@@ -1,48 +1,36 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MindBreaker</name>
     <message>
         <source>New Game</source>
         <translation>FOO</translation>
     </message>
     <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>
         <source>Cancel</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
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,37 +1,33 @@
 <!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>
         <source>Game</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mine Sweep</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -410,523 +410,503 @@
     <message>
         <source>Device</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Configure Profiles</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Save Connection</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Connect</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>QuickLaunch</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The shell button launches the &quot;default&quot; profile. If there is none default values are taken</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Transfer file...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Line wrap</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Full screen</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Save history</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Terminate</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Close Window</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Run Script</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Record Script</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Save Script</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Open Keyboard...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New from Profile</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Connection</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Scripts</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Script</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;qt&gt;There is no Connection.&lt;/qt&gt;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>History</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New Profile</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Save Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Log</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModemConfigWidget</name>
     <message>
         <source>Modem is attached to:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter telefon number here:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>AT commands</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter number</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>NoOptions</name>
     <message>
         <source>This Plugin does not support any configurations</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>ProfileEditorDialog</name>
     <message>
         <source>Connection</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Auto connect after load</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Local Console</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New Profile</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Opie Console</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Failed</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Connecting failed for this session.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Session failed</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Cannot open session: Not all components were found.&lt;/qt&gt;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Transfer mode</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Receive</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Send file</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Transfer protocol</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Progress</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Ready</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start transfer</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>File transfer</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No file has been specified.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sending...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Receiving...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cancelled</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The file transfer has been cancelled.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Operation not supported.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Transfer could not be started.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No error.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Undefined error occured.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Incomplete transfer.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unknown error occured.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sent</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>File has been sent.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Received</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>File has been received.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Profile name</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Profile</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Connection</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Special Keys</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Invalid profile</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Please enter a profile name.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Z-Modem</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Y-Modem</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>X-Modem</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Serial</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Modem</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Local Console</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Default Terminal</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Default Keyboard</source>
         <translation>FOO</translation>
     </message>
     <message>
         <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>
         <source>Reset speakers</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Turning off dialtone</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Dial number</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Line busy, redialing number</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Dismiss</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Dialing the number failed.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fixing up Embedix</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SerialConfigWidget</name>
     <message>
         <source>Device</source>
         <translation>FOO</translation>
     </message>
 </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>
         <source>Options</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Local echo</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Line wrap</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>VT 100</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>VT 102</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Linux Console</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>X-Terminal</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>green on black</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>orange on black</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
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
@@ -1,300 +1,328 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BaseSetup</name>
     <message>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slideshow timeout:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Toggle autoscale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to next image</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Delete Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Image Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></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>Browser Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Keyboard Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie Eye - Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Imageinfo Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Imageview Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Go dir up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start slideshow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and Imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show images fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto rotate images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show images unscaled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show zoomer window when unscaled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
     <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>
         <source>&lt;center&gt;&lt;b&gt;Be carefull with the following options!&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show files recursive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recursion depth:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Digital Camera View</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Name Only</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>imageinfo</name>
     <message>
         <source>View Full Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays an thumbnail of the image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays info of selected image</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,141 +1,122 @@
 <!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>
         <source>User</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Suspend</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>LoginWindowImpl</name>
     <message>
         <source>Restart</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Wrong password</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The given password is incorrect.</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>OPIE was terminated
-by an uncaught signal
-(%1)
-</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Failure</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Could not start OPIE.</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Could not switch to new user identity</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Opie was terminated
 by an uncaught signal
 (%1)
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Could not start Opie.</source>
         <translation>FOO</translation>
     </message>
 </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>
     <message>
         <source>&lt;b&gt;Password:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Confirm:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PasswordDialogImpl</name>
     <message>
         <source>Trying to leave without password set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;No password was set. This could lead to you not beeingable to remotely connect to your machine.Do you want to continue not setting a password?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passwords don&apos;t match</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The two passwords don&apos;t match. Please try again.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password not legal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The entered password is not a valid password.Please try entering a valid password.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,791 +1,719 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DCCProgress</name>
     <message>
         <source>Receiving file %1 from %2...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully received %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Peer Aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Timeout</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DCCTransferTab</name>
     <message>
         <source>DCC Transfers in Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are transfers in progress. &lt;br&gt;If you close this tab, they will be canceled.&lt;br&gt;Do you want to close it anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DCC Transfer from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is trying to send you the file %2
 (%3 bytes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Reject</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCChannelTab</name>
     <message>
         <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>
         <source>Whois</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Socket error : </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>IRCHistoryLineEdit</name>
     <message>
         <source>Next Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Mode change has unknown type</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>You were kicked from </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> by </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> was kicked from </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>You joined channel </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No such nickname</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Received unhandled numeric command: %1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Received unhandled ctcp command: %1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Received unhandled literal command: %1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>%1 joined channel %2</source>
         <translation>FOO</translation>
     </message>
     <message>
         <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>
         <source>There are %1 unknown connection(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are %1 channels formed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait a while and try again</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Whois %1 (%2@%3)
 Real name: %4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is using server %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is on channels: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Names for %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time on server %1 is %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel or nick %1 doesn&apos;t exists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is no history information for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t change nick to %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You&apos;re not on channel %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>[%1] Operation not permitted, you don&apos;t have enough channel privileges</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connected to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 has been idle for %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 signed on %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP PING with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP PING with unknown channel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP PING with bad recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP VERSION request from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING reply from %1: %2 seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malformed DCC request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Private discussion</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Hostname :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Port :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Nickname :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Realname :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Your real name</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Password :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Channels :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit server information</source>
         <translation>FOO</translation>
     </message>
     <message>
         <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>
     <message>
         <source>Please choose a server profile</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
         <translation>FOO</translation>
     </message>
     <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>
 <context>
     <name>IRCSession</name>
     <message>
         <source>You are now known as %1</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Nickname change of an unknown person</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>%1 is now known as %2</source>
         <translation type="unfinished">FOO</translation>
     </message>
 </context>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Lines displayed :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>General</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Background color :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Normal text color :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error color :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text written by others :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text written by the server :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Notifications :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Display time in chat log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Keyboard Shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCTab</name>
     <message>
         <source>Missing description</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Close this tab</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>IRC</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New connection</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source> User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie IRC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> gives channel operator status to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> removes channel operator status from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> gives voice to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> removes voice from </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,817 +1,878 @@
 <!DOCTYPE TS><TS>
 <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>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerUI</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposeMail</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please create an SMTP account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a File.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Store message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Store message into drafts?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Attachments will not be stored in &quot;Draft&quot; folder&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Receiver specified</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposeMailUI</name>
     <message>
         <source>Compose Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>send later</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>use:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BCC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <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>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>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete the selected Account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select an account.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccountsUI</name>
     <message>
         <source>Configure Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>News</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IMAPconfigUI</name>
     <message>
         <source>Configure IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefix</source>
         <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>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>
     </message>
     <message>
         <source>Send queued mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show/Hide folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Newsgroups</source>
         <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>
     </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>
 <context>
     <name>NNTPconfigUI</name>
     <message>
         <source>Configure NNTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Newsgroup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get newsgroup list from server</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Newmdirdlgui</name>
     <message>
         <source>Enter directory name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directory name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directory contains other subdirs</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <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>
     </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>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></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>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec imapd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>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>
     </message>
     <message>
         <source>Use Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the SMTP Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port of the SMTP Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SelectMailTypeUI</name>
     <message>
         <source>Select Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Account Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>POP3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SMTP</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SettingsDialogUI</name>
     <message>
         <source>Settings Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View mail as Html</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compose Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mails later ( enqueue in outbox )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></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>
     </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>
     </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>
     </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>
     </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>
     </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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Store mail(s) to&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Folder:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create new folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefix will prepend, no need to enter it!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move mail(s)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,224 +1,151 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HelpWindow</name>
     <message>
         <source>Backward</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Forward</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>QtRec</name>
     <message>
         <source>OpieRecord </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>FOO</translation>
     </message>
     <message>
         <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>
         <source>Volume</source>
         <translation>FOO</translation>
     </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>
     <message>
         <source>Send with Ir</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Ir Beam out</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Rec</source>
-        <translation 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>
         <source>Please select file to play</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,171 +1,131 @@
 <!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>
         <source>Options</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter your search terms here</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Search for: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case sensitive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OListView</name>
     <message>
         <source>Results</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>show</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>edit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>open in filemanager</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>open with </source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>show completed tasks</source>
-        <translation 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>
         <source>Search in dates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search content</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,471 +1,459 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CalcDlg</name>
     <message>
         <source>Molecular Weight</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Chemical Formula</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Calculate</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Molecular Weight (u):</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Elemental Composition (%):</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>CalcDlg</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OxydataWidget</name>
     <message>
         <source>%1 u</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>%1 pm</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>%1 J</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>%1 g/cm^3</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>%1 K</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Block</source>
         <translation>FOO</translation>
     </message>
     <message>
         <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>
         <source>Melting point</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Oxygen</name>
     <message>
         <source>Oxygen</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>PSE</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Data</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Hydrogen</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Helium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Lithium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Beryllium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Boron</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Carbon</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Nitrogen</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Fluorine</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Neon</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sodium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Magnesium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Aluminum</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Silicon</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Phosphorus</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sulfur</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Chlorine</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Argon</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Potassium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Calcium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Scandium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Titanium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Vanadium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Chromium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Manganese</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Iron</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cobalt</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Nickel</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Copper</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Zinc</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Gallium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Germanium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Arsenic</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Selenium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Bromine</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Krypton</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Rubidium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Strontium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Yttrium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Zirconium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Niobium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Molybdenum</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Technetium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Ruthenium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Rhodium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Palladium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Silver</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cadmium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Indium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tin</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Antimony</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tellurium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Iodine</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Xenon</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cesium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Barium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Lanthanum</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cerium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Praseodymium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Neodymium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Promethium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Samarium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Europium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Gadolinium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Terbium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Dysprosium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Holmium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Erbium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Thulium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Ytterbium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Lutetium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Hafnium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tantalum</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tungsten</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Rhenium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Osmium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Iridium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Platinum</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Gold</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mercury</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Thallium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Lead</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Bismuth</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Polonium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Astatine</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Radon</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Francium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Radium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Actinium</source>
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
@@ -1,97 +1,73 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CanvasCardWindow</name>
     <message>
         <source>Patience</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Freecell</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Chicane</source>
         <translation>FOO</translation>
     </message>
     <message>
         <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>
         <source>Snap to position</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Turn one card</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Turn three cards</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
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
@@ -1,586 +1,413 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <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>
 <context>
     <name>FirstUse</name>
     <message>
         <source>&lt;&lt; Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next &gt;&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap anywhere on the screen to continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait, loading %1 settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finish</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputMethods</name>
     <message>
         <source>Unicode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
-        <source>Finding documents</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Searching documents</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Documents</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>Icon View</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
-        <source>%1 files</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>All types of file</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Document View</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>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>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Remove</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>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Server</name>
     <message>
         <source>USB Lock</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
-        <source>Battery level is critical!
-Keep power off until power restored!</source>
-        <translation type="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>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Critical Memory Shortage
 Please end this application
 immediately.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WARNING</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The battery is running very low. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The Back-up battery is very low&lt;p&gt;Please charge the back-up battery</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
-        <source>&lt;p&gt;
-These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
-        <translation type="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
@@ -1,395 +1,244 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoginBase</name>
     <message>
         <source>LoginBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you select this option, opie-login will automagically log you in with the user you have selected in the drop-down list.  
 
 For the Zaurus 5x00 this is always the user &quot;root&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This drop-down list allows you to select the user for auto-login
 (if enabled above).  
 
 You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MultiauthConfig</name>
     <message>
         <source>Security configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the order they will appear in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
         <source>Locking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></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-securityplugin-*&lt;/em&gt; package! Once you have done that, you will be able to configure your PDA protection here.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MultiauthGeneralConfig</name>
     <message>
         <source>When to lock Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on Opie start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on Opie resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Multiple plugins authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Required successes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Don&apos;t protect this config screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show explanatory screens</source>
         <translation type="unfinished"></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>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You must save your current settings before trying to authenticate. Press OK to accept and launch a simulated authentication process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you don&apos;t like the result of this test, don&apos;t forget to change your settings before you exit the configuration application!</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>
     </message>
     <message>
         <source>Select a net-range or enter a new one.  
 
 This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
 
 For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
 
 The entry &quot;All&quot; will allow *any* IP to connect. 
 The entry &quot;None&quot; will *deny* any connection.  
 
 If unsure, select &quot;Any&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the selected net range from the list
 
 If you press this button, the currently selected net range will be deleted from the list of net ranges.
 
 If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
 the list to the state it has been when you initially booted your Zaurus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button will restore the list of net ranges
 to the defaults.
 
 Beware that all manually entered net ranges will be lost!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select your sync software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Qtopia 1.7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie 1.0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IntelliSync</source>
         <translation type="unfinished"></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="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,48 +1,40 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>SnakeGame</name>
     <message>
         <source>Snake</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New Game</source>
         <translation>FOO</translation>
     </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
@@ -1,393 +1,353 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tests</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSysInfo</name>
     <message>
         <source>CF</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Ha</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>SD</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>SC</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>In</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>RA</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
-        <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
-Memory is categorized as follows:
-
-1. Used - memory used to by Opie and any running applications.
-2. Buffers - temporary storage used to improve performance
-3. Cached - information that has recently been used, but has not been freed yet.
-4. Free - memory not currently used by Opie or any running applications.</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Used (%1 kB)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Used By</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>You really want to execute
-</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Used by</source>
         <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>
         <source>Used (%1 kB)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>You really want to send
-</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>You really want to send %1 to this process?</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Really want to send %1
 to this process?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>CPU</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Benchmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syslog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>&lt;p&gt;Model: </source>
-        <translation 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>
         <source>Built against Qt/E </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,69 +1,58 @@
 <!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>
     <message>
         <source>TableViewer - Edit Keys</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Key Name</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Key Type</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Clear All</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>TVListView</name>
     <message>
         <source>List View</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>TableViewerWindow</name>
     <message>
         <source>Table Viewer</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>could not load Document</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
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
@@ -1,277 +1,272 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>TextEdit</name>
     <message>
         <source>New</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Save As</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cut</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Insert Time and Date</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Find...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Zoom in</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Zoom out</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Advanced Features</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Wrap lines</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start with new file</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Prompt on Exit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Always open linked file</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>File Permissions</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Search Bar Open</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>File</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>View</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>All</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>.desktop File</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Linked Document</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Goto Line...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Auto Save 5 min.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text Editor has detected&lt;BR&gt;you selected a &lt;B&gt;.desktop&lt;/B&gt;file.&lt;BR&gt;Open&lt;B&gt;.desktop&lt;/B&gt; file or &lt;B&gt;linked&lt;/B&gt; file?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text Edit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Write Failed</source>
         <translation>FOO</translation>
     </message>
     <message>
         <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>
         <source>Textedit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Textedit detected
 you have unsaved changes
 Go ahead and save?
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Don&apos;t Save</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Not enough lines</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>%1 - Text Editor</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>FOO</translation>
     </message>
     <message>
         <source>Save Failed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>File Permissions</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Set File Permissions</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>group</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>others</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>read</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>write</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
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,48 +1,41 @@
 <!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>
     </message>
     <message>
         <source>Quit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click Play to start</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Make your move</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>You won!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Computer won!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>It&apos;s a draw</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/today.ts b/i18n/xx/today.ts
index 37e7d76..db64675 100644
--- a/i18n/xx/today.ts
+++ b/i18n/xx/today.ts
@@ -1,196 +1,142 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>No plugins found</source>
-        <translation 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>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <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>
         <source>autostart on resume?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tiny banner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Have small banner </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source> pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>icon size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> sec</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>never</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>refresh</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,631 +1,535 @@
 <!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>
 <context>
     <name>NewTaskDlg</name>
     <message>
         <source>New Task</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Blank task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Using template:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Alarms</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Information</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Recurrence</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Task Editor</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>Opie</name>
     <message>
         <source>Todo List</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Task</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
         <translation>FOO</translation>
     </message>
     <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>
         <source>Edit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to set the priority of new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter description of new task here.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>More</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to enter additional information for new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to add new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to reset new task information.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Data can not be edited, currently syncing</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Data can&apos;t be edited, currently syncing</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>Table View</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>None</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>New</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Description:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter brief description of the task here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Complete </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Work on </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Buy </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Organize </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Get </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Update </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Create </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Plan </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Call </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mail </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select priority of task here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Very High</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>High</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <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>
 <context>
     <name>TaskEditorStatus</name>
     <message>
         <source>Status:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to set the current status of this task.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Started</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Not started</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select progress made on this task here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>0 %</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>20 %</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>40 %</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>60 %</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>80 %</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>100 %</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start Date:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to set the date this task was started.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Due Date:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to set the date this task needs to be completed by.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Completed:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to mark this task as completed.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to set the date this task was completed.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Maintainer Mode:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to set the maintainer&apos;s role.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Nothing</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Done By</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Maintainer:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This is the name of the current task maintainer.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>test</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to select the task maintainer.</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
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
@@ -1,35 +1,31 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GroupDialog</name>
     <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>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
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,832 +1,566 @@
 <!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>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <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>
         <source>&amp;Import text file</source>
         <translation>Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
         <translation>Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
         <translation>&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation 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>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation 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>
         <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
         <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
         <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
         <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
         <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
         <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
         <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
         <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
         <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
         <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
         <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
         <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
         <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
         <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
         <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
         <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
-        <source>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>
         <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No document defined.
 You have to create a new document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to save </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 before continuing?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Now you have to enter
 a password twice for your
 newly created document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&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>
         <source>&lt;P&gt;You must create a new document first. Ok to create?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Password Manager&lt;br&gt;ZSafe version 2.1.2&lt;br&gt;&lt;/b&gt;by Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Translations by Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,723 +1,731 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Continue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error!</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>This is an all day event.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this occurence</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00 PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Views</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
+    <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>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstEvent</name>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Start Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Silent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>nd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>rd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>th</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</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,71 +1,68 @@
 <!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>
     </message>
     <message>
         <source>Stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
         <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>
     </message>
 </context>
 </TS>
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
@@ -1,300 +1,328 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BaseSetup</name>
     <message>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slideshow timeout:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Toggle autoscale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to next image</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Delete Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Image Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></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>Browser Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Keyboard Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie Eye - Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Imageinfo Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Imageview Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Go dir up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start slideshow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and Imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show images fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto rotate images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show images unscaled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show zoomer window when unscaled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
     <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>
         <source>&lt;center&gt;&lt;b&gt;Be carefull with the following options!&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show files recursive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recursion depth:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Digital Camera View</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Name Only</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>imageinfo</name>
     <message>
         <source>View Full Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays an thumbnail of the image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays info of selected image</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,817 +1,878 @@
 <!DOCTYPE TS><TS>
 <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>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerUI</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposeMail</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please create an SMTP account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a File.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Store message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Store message into drafts?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Attachments will not be stored in &quot;Draft&quot; folder&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Receiver specified</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposeMailUI</name>
     <message>
         <source>Compose Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>send later</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>use:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BCC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <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>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>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete the selected Account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select an account.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccountsUI</name>
     <message>
         <source>Configure Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>News</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IMAPconfigUI</name>
     <message>
         <source>Configure IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefix</source>
         <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>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>
     </message>
     <message>
         <source>Send queued mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show/Hide folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Newsgroups</source>
         <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>
     </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>
 <context>
     <name>NNTPconfigUI</name>
     <message>
         <source>Configure NNTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Newsgroup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get newsgroup list from server</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Newmdirdlgui</name>
     <message>
         <source>Enter directory name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directory name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directory contains other subdirs</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <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>
     </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>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></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>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec imapd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>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>
     </message>
     <message>
         <source>Use Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the SMTP Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port of the SMTP Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SelectMailTypeUI</name>
     <message>
         <source>Select Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Account Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>POP3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SMTP</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SettingsDialogUI</name>
     <message>
         <source>Settings Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View mail as Html</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compose Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mails later ( enqueue in outbox )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></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>
     </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>
     </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>
     </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>
     </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>
     </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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Store mail(s) to&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Folder:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create new folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefix will prepend, no need to enter it!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move mail(s)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,832 +1,566 @@
 <!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>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <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>
         <source>&amp;Import text file</source>
         <translation>Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
         <translation>Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
         <translation>&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation 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>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation 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>
         <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
         <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
         <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
         <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
         <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
         <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
         <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
         <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
         <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
         <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
         <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
         <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
         <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
         <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
         <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
         <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
-        <source>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>
         <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No document defined.
 You have to create a new document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to save </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 before continuing?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Now you have to enter
 a password twice for your
 newly created document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&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>
         <source>&lt;P&gt;You must create a new document first. Ok to create?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Password Manager&lt;br&gt;ZSafe version 2.1.2&lt;br&gt;&lt;/b&gt;by Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Translations by Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,521 +1,449 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation>全名</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>聯絡人</translation>
     </message>
     <message>
         <source>Pick</source>
         <translation>選取</translation>
     </message>
 </context>
 <context>
     <name>AbView</name>
     <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>
         <source>Unable to find a contact for this search pattern!</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>
         <source>Add Contact?</source>
         <translation>新增聯絡人?</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation>確定要在%1加入聯絡人?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>&amp;全部都是</translation>
     </message>
     <message>
         <source>You have to select a contact !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Contact</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation>查詢樣式</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>使用一般的表達方式</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>使用萬用字元(*,?)</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>大小寫不同</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>郵件</translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation>採用QT-Mail</translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation>採用Opie-Mail</translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation>注意: QT-Maily僅在Sharp的預設ROM中提供.Opie-Mail可免費安裝 </translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>其他</translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation>搜尋之設定</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>字型</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>小</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>一般</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>大</translation>
     </message>
     <message>
         <source>Order</source>
         <translation>順序</translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation>選擇聯絡人順序</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>上移</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>下移</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>增加</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>移除</translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation>設定</translation>
     </message>
     <message>
         <source>Click on tab to select one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If selected, search differs between upper and lower chars</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font size for list- and card view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tool-/Menubar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to fixed menu-/toolbars after restarting application !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Moveable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to moveable menu-/toolbars after restarting application !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move selected attribute one line up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>First Name</source>
         <translation>名</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>中名</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>姓</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Suffix</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>歸檔為</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>性別</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>職稱</translation>
     </message>
     <message>
         <source>City</source>
         <translation>城市</translation>
     </message>
     <message>
         <source>State</source>
         <translation>州</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>國家</translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation>全名...</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>組織</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>類別</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>註解...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>一般</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>商務</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>住家</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>住址</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>郵遞區號</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>美國</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>英國</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>日本</translation>
     </message>
     <message>
         <source>France</source>
         <translation>法國</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>德國</translation>
     </message>
     <message>
         <source>Norway</source>
         <translation>挪威</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>加拿大</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>男性</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>女性</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>細項</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>輸入註解</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>編輯姓名</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>聯絡人</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation>阿爾巴尼亞</translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation>阿爾及利亞</translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation>美屬薩摩亞</translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation>安道爾共和國</translation>
     </message>
     <message>
         <source>Angola</source>
         <translation>安哥拉</translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation>安圭拉島</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>阿根廷</translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation>Aruba</translation>
     </message>
     <message>
         <source>Australia</source>
         <translation>澳洲</translation>
     </message>
     <message>
@@ -997,552 +925,385 @@ is provided free !</source>
     <message>
         <source>Oman</source>
         <translation>阿曼</translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation>巴基斯坦</translation>
     </message>
     <message>
         <source>Palau</source>
         <translation>Palau</translation>
     </message>
     <message>
         <source>Panama</source>
         <translation>巴拿馬</translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation>巴布亞島新幾內亞島</translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation>巴拉圭</translation>
     </message>
     <message>
         <source>Peru</source>
         <translation>祕魯</translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation>菲律賓</translation>
     </message>
     <message>
         <source>Poland</source>
         <translation>波蘭</translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation>葡萄牙</translation>
     </message>
     <message>
         <source>Puerto Rico</source>
         <translation>波多黎各</translation>
     </message>
     <message>
         <source>Qatar</source>
         <translation>卡達</translation>
     </message>
     <message>
         <source>Reunion</source>
         <translation>留尼旺島</translation>
     </message>
     <message>
         <source>Romania</source>
         <translation>羅馬尼亞</translation>
     </message>
     <message>
         <source>Russia</source>
         <translation>俄羅斯</translation>
     </message>
     <message>
         <source>Rwanda</source>
         <translation>盧安達</translation>
     </message>
     <message>
         <source>Saint Lucia</source>
         <translation>聖路西亞</translation>
     </message>
     <message>
         <source>Samoa</source>
         <translation>薩摩亞</translation>
     </message>
     <message>
         <source>San Marino</source>
         <translation>聖馬利諾</translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
         <translation>沙烏地阿拉伯</translation>
     </message>
     <message>
         <source>Senegal</source>
         <translation>塞內加爾</translation>
     </message>
     <message>
         <source>Seychelles</source>
         <translation>塞席爾群島</translation>
     </message>
     <message>
         <source>Sierra Leone</source>
         <translation>獅子山</translation>
     </message>
     <message>
         <source>Singapore</source>
         <translation>新加坡</translation>
     </message>
     <message>
         <source>Slovakia</source>
         <translation>斯洛伐克</translation>
     </message>
     <message>
         <source>Slovenia</source>
         <translation>斯洛維尼亞共和國</translation>
     </message>
     <message>
         <source>Solomon Islands</source>
         <translation>所羅門群島</translation>
     </message>
     <message>
         <source>Somalia</source>
         <translation>索馬利亞</translation>
     </message>
     <message>
         <source>South Africa</source>
         <translation>南非</translation>
     </message>
     <message>
         <source>Spain</source>
         <translation>西班牙</translation>
     </message>
     <message>
         <source>Sri Lanka</source>
         <translation>斯里蘭卡</translation>
     </message>
     <message>
         <source>St. Helena</source>
         <translation>聖海倫娜</translation>
     </message>
     <message>
         <source>Sudan</source>
         <translation>蘇丹</translation>
     </message>
     <message>
         <source>Suriname</source>
         <translation>蘇利南莫河</translation>
     </message>
     <message>
         <source>Swaziland</source>
         <translation>史瓦濟蘭</translation>
     </message>
     <message>
         <source>Sweden</source>
         <translation>瑞典</translation>
     </message>
     <message>
         <source>Switzerland</source>
         <translation>瑞士</translation>
     </message>
     <message>
         <source>Taiwan</source>
         <translation>臺灣</translation>
     </message>
     <message>
         <source>Tajikistan</source>
         <translation>塔吉克</translation>
     </message>
     <message>
         <source>Tanzania</source>
         <translation>坦尚尼亞</translation>
     </message>
     <message>
         <source>Thailand</source>
         <translation>泰國</translation>
     </message>
     <message>
         <source>Togo</source>
         <translation>多哥</translation>
     </message>
     <message>
         <source>Tokelau</source>
         <translation>Tokelau</translation>
     </message>
     <message>
         <source>Tonga</source>
         <translation>東加</translation>
     </message>
     <message>
         <source>Tunisia</source>
         <translation>突尼西亞</translation>
     </message>
     <message>
         <source>Turkey</source>
         <translation>土耳其</translation>
     </message>
     <message>
         <source>Turkmenistan</source>
         <translation>土庫曼</translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation>吐瓦魯</translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation>烏干達</translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation>烏克蘭</translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation>烏拉圭</translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation>烏茲別克斯坦</translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation>萬那杜</translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation>委內瑞拉</translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation>維京群島</translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation>西撒阿拉</translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation>葉門</translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation>南斯拉夫</translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation>尚比亞</translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation>辛巴威</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>生日</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>週年紀念日</translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation>科威特</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>未知</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>刪除</translation>
     </message>
     <message>
         <source>Press to enter last- middle and firstname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter fullname directly ! If you have a lastname with multiple words ( for instance &quot;de la Guerra&quot;), please write &lt;lastname&gt;,&lt;firstnames&gt; like this: &quot;de la Guerra, Carlos Pedro&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The working place of the contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press to select attribute to change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press to select how to store the name (and howto show it in the listview)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Afghanistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Antarctica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Armenia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bolivia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cameroon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ghana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guadeloupe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea-Bissau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jamaica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kiribati</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kyrgyzstan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vietnam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie</name>
     <message>
         <source>Contact</source>
         <translation type="unfinished">聯絡人</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation type="unfinished">聯絡人</translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation type="unfinished">開始搜尋</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation type="unfinished">寫電郵給</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation type="unfinished">輸入 cVard</translation>
     </message>
     <message>
         <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
@@ -1,410 +1,358 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>AdvancedFm</source>
         <translation>進階檔案管理程式</translation>
     </message>
     <message>
         <source>File</source>
         <translation>檔案</translation>
     </message>
     <message>
         <source>View</source>
         <translation>檢視</translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation>顯示隱藏的檔案</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>建立目錄</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>重新命名</translation>
     </message>
     <message>
         <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>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>Yes</source>
         <translation>是</translation>
     </message>
     <message>
         <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>
         <source>Ir sent.</source>
         <translation>紅外線傳送.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>確定</translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>改變目錄</translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>執行</translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation>開啟為文字檔</translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation>建立 Symlink</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>複製</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>移動</translation>
     </message>
     <message>
         <source>File Info</source>
         <translation>檔案資訊</translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation>設定權限</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>內容</translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation>傳輸檔案</translation>
     </message>
     <message>
         <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>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AdvancedFm :: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> kB free</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to View 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to View 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not Yet Implemented</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&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>
         <source>Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1 files?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1 and all it&apos;s contents?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really copy %1 files?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 already  exists. Ok to overwrite?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Could not copy %1 to %2&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy %1 As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt; %1 already exists. Ok to overwrite?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not copy %1 to %2&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt; %1 already exists. Do you really want to delete it?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not move %1&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not copy %1 to %2&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation>將輸出存為檔案(只有名稱)</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>輸出</translation>
     </message>
     <message>
         <source>Process could not start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Finished
 </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>設定檔案權限</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>設定這個檔案的權限:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>所有者</translation>
     </message>
     <message>
         <source>group</source>
         <translation>群組</translation>
     </message>
     <message>
         <source>others</source>
         <translation>其他</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>所有者</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>群組</translation>
     </message>
     <message>
         <source>read</source>
         <translation>讀</translation>
     </message>
     <message>
         <source>write</source>
         <translation>寫</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>執行</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>filePermissions</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,293 +1,233 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Appearance</name>
     <message>
         <source>Settings...</source>
         <translation>設定...</translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation>目前的主題</translation>
     </message>
     <message>
         <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>
         <source>Drop down list</source>
         <translation>直式索引標籤</translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation>有圖示的直式索引標籤</translation>
     </message>
     <message>
         <source>Top</source>
         <translation>頂端</translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation>底部</translation>
     </message>
     <message>
         <source>Style</source>
         <translation>樣式</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>字型</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>顏色</translation>
     </message>
     <message>
         <source>Windows</source>
         <translation>視窗</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>進階</translation>
     </message>
     <message>
-        <source>Restart</source>
-        <translation 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>請按這裡以設定目前選擇的樣式.
 
 注意: 並非所有的樣式都有這個選項.</translation>
     </message>
     <message>
         <source>Window decorations control the way the application title bar and its buttons appear.
 
 Click here to select an available decoration.</source>
         <translation>視窗裝飾控制了應用程式的標題列與其按鈕的顯示方式.
 
 請按這裡以選擇可以使用的裝飾.</translation>
     </message>
     <message>
         <source>Select the desired name, style and size of the default font applications will use.</source>
         <translation>選擇想要的名稱, 樣式和應用程式所使用的預設字型大小.</translation>
     </message>
     <message>
         <source>Color schemes are a collection of colors which are used for various parts of the display.
 
 Click here to select an available scheme.</source>
         <translation>色彩主題是用在顯示時各個部份的顏色的集合.
 
 請按這裡以選擇可以使用的主題.</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation>按這裡讓索引標籤出現在視窗的頂端.</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation>按這裡讓索引標籤出現在視窗的底部.</translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation>這是一個預覽視窗. 在這裡可以看到在改變選項之後的新外觀.</translation>
     </message>
     <message>
         <source>Rotation direction:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Appearance Settings</source>
         <translation type="unfinished"></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>
         <translation>編輯主題</translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation>按這裡來選擇顏色: </translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
         <translation>範例</translation>
     </message>
     <message>
         <source>Normal Item</source>
         <translation>一般項目</translation>
     </message>
     <message>
         <source>Disabled Item</source>
         <translation>停用的項目</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>選單</translation>
     </message>
     <message>
         <source>Normal Text</source>
         <translation>一般文字</translation>
     </message>
     <message>
         <source>Highlighted Text</source>
         <translation>突顯的文字</translation>
     </message>
     <message>
         <source>Button</source>
         <translation>按鈕</translation>
     </message>
     <message>
         <source>Check Box</source>
         <translation>核取方塊</translation>
     </message>
     <message>
         <source>Sample window using the selected settings.</source>
         <translation>範例視窗使用選擇的設定值.</translation>
     </message>
 </context>
 </TS>
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,156 +1,148 @@
 <!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>
     <message>
         <source>Backup Failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup and Restore.. Failed !!</source>
         <translation type="unfinished"></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 type="unfinished"></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>
         <source>Restore Backup...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;%1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore</source>
         <translation type="unfinished">還原</translation>
     </message>
     <message>
         <source>Would you really overwrite your local data?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <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>第一行</translation>
     </message>
     <message>
         <source>&amp;Restore</source>
         <translation>&amp;還原</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>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ErrorDialog</name>
     <message>
         <source>Error Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error Message:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,339 +1,331 @@
 <!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>
         <source>CE</source>
         <translation>CE</translation>
     </message>
     <message>
         <source>log</source>
         <translation>log</translation>
     </message>
     <message>
         <source>ln</source>
         <translation>ln</translation>
     </message>
     <message>
         <source>(</source>
         <translation>(</translation>
     </message>
     <message>
         <source>)</source>
         <translation>)</translation>
     </message>
     <message>
         <source>sin</source>
         <translation>sin</translation>
     </message>
     <message>
         <source>cos</source>
         <translation>cos</translation>
     </message>
     <message>
         <source>tan</source>
         <translation>tan</translation>
     </message>
     <message>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
         <source>+/-</source>
         <translation>+/-</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>=</source>
         <translation>=</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>.</source>
         <translation>.</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Distance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>acres</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&#xb0;C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>carats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&#xb0;F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>fl oz (US)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>g</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>gal (US)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>hectares</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>km</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>l</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>lb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lg tons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ml</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>naut. mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>oz</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>pt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>qt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq km</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq yd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>St tons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tblspoon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>teaspoons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tonnes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>yd</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,283 +1,206 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AlarmDlg</name>
     <message>
         <source>Clock</source>
         <translation type="unfinished">時鐘</translation>
     </message>
     <message>
         <source>Snooze</source>
         <translation type="unfinished">打盹</translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AlarmDlgBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>TextLabel1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Snooze</source>
         <translation type="unfinished">打盹</translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thu</source>
         <comment>Thursday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fri</source>
         <comment>Friday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat</source>
         <comment>Saturday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sun</source>
         <comment>Sunday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lap/Split</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Daily Alarm:&lt;/b&gt;&lt;p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily alarm requires at least
 one day to be selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished">全部</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished">Audio</translation>
     </message>
 </context>
 <context>
     <name>ClockBase</name>
     <message>
         <source>Clock</source>
         <translation type="unfinished">時鐘</translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stopwatch</source>
         <translation type="unfinished">碼表</translation>
     </message>
     <message>
         <source>Split</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished">開始</translation>
     </message>
     <message>
         <source>Starts and stops the stopwatch.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lap/Split</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Resets the stopwatch.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check to enable the daily alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the hour the alarm will sound.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the minute the alarm will sound.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished">AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished">PM</translation>
     </message>
     <message>
         <source>Days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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
@@ -1,822 +1,826 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation>行事曆</translation>
     </message>
     <message>
         <source>New</source>
         <translation>新文件</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>今天</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Day</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Week</translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation>Weeklst</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>月份</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>尋找</translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation>Event duration is potentially longer
 than interval between repeats.</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>不能編輯資料，正在同步中</translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation>編輯事件</translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation>分鐘)</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>確定</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>空間不足</translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation>尚未儲存你的設定.
  請清空一點空間再試一次....
 Quit anyway?</translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation>(未知的)</translation>
     </message>
     <message>
         <source>Error!</source>
         <translation>錯誤!</translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation>修正他</translation>
     </message>
     <message>
         <source>Continue</source>
         <translation>繼續</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error box</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation>M</translation>
     </message>
     <message>
         <source>T</source>
         <translation>T</translation>
     </message>
     <message>
         <source>W</source>
         <translation>W</translation>
     </message>
     <message>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>一</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>二</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>三</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>四</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>五</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>六</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>天</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00p</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation>開始</translation>
     </message>
     <message>
         <source>End</source>
         <translation>結束</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>編輯</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>刪除</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>紅外線</translation>
     </message>
     <message>
         <source>This is an all day event.</source>
         <translation>這是一個終日事件.</translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this occurence</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation>:00 下午</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation>:00 上午</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>下午</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>上午</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished">行事曆</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>喜好選項</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished">:00</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="unfinished">分鐘</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation>大</translation>
     </message>
     <message>
         <source>Views</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished">開始</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished">公司</translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished">家</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
+    <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>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. 一月-00. 一月</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstEvent</name>
     <message>
         <source>Edit</source>
         <translation type="unfinished">編輯</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">刪除</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished">紅外線</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>W: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation>p</translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Calendar</source>
         <translation>行事曆</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>重覆...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>每日...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>每星期...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>每月...</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>每年...</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>不重覆...</translation>
     </message>
     <message>
         <source>Start Time</source>
         <translation>開始時間</translation>
     </message>
     <message>
         <source>End Time</source>
         <translation>結束時間</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>新事件</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>地點</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>分類</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>約會</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>中餐</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>晚餐</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>旅行</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>公司</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>家</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start time</source>
         <translation type="unfinished">開始時間</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>終日</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>時區</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;A鬧鐘</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>分鐘</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>沉默</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>大聲</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>重覆</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>不重覆...</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>序述</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>開始 - 結束</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>備忘錄...</translation>
     </message>
-    <message>
-        <source>Start Time</source>
-        <translation type="obsolete">開始時間</translation>
-    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>編輯備忘錄</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>開始</translation>
     </message>
     <message>
         <source>End</source>
         <translation>結束</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>每</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>每 %1 %2 </translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>每%1</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>每%1 %1</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>每</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>星期一</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>星期二</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>星期三</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>星期四</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>星期五</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>星期六</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>星期天</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>st</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>nd</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>rd</translation>
     </message>
     <message>
         <source>th</source>
         <translation>th</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation>不重覆</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>日(s)</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>星期(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>重覆</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>日</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>日期</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>月(s)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>年(s)</translation>
     </message>
     <message>
         <source>days</source>
         <translation>日</translation>
     </message>
     <message>
         <source>day</source>
         <translation>日</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>星期</translation>
     </message>
     <message>
         <source>week</source>
         <translation>星期</translation>
     </message>
     <message>
         <source>month</source>
         <translation>月</translation>
     </message>
     <message>
         <source>year</source>
         <translation>年</translation>
     </message>
     <message>
         <source> and </source>
         <translation>和</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>, 和</translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, 和</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>重覆事件</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation>日</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>星期</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>月</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>年</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>每:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>頻率</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>結束:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>無結束日期</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>重覆</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>一</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>二</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>三</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>四</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>五</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>六</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>日</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>每</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>months</source>
         <translation>月</translation>
     </message>
     <message>
         <source>years</source>
         <translation>年</translation>
     </message>
 </context>
 </TS>
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
@@ -1,293 +1,249 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation>指令選擇</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>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>
         <source>Tab</source>
         <translation>Tab</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>上</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>下</translation>
     </message>
     <message>
         <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>
         <source>Cyan on White</source>
         <translation>白底藍綠字</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>藍綠底白字</translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation>黑底藍字</translation>
     </message>
     <message>
         <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>
         <source>ScrollBar</source>
         <translation>捲動軸</translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation>顯示指令清單</translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation>隱藏指令清單</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation>自訂</translation>
     </message>
     <message>
         <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>
         <source>Hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Pink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pink on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>new session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sessions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To exit fullscreen, tap here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History Lines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konsole </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>指令選擇</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation>加入指令</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation>輸入要加入的指令:</translation>
     </message>
 </context>
 </TS>
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
@@ -1,100 +1,96 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FifteenConfigDialog</name>
     <message>
         <source>All Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select board background</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FifteenConfigDialogBase</name>
     <message>
         <source>Configure Fifteen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use a Custom Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Path:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Preview:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Grid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Rows:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
 <context>
     <name>PiecesTable</name>
     <message>
         <source>Fifteen Pieces</source>
         <translation>十五片</translation>
     </message>
     <message>
         <source>Congratulations!
 You win the game!</source>
         <translation>恭喜!
 你贏了這場遊戲!</translation>
     </message>
     <message>
         <source>R&amp;andomize Pieces</source>
         <translation>隨機放置(&amp;A)</translation>
     </message>
     <message>
         <source>&amp;Reset Pieces</source>
         <translation>重設位置(&amp;R)</translation>
     </message>
 </context>
 </TS>
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
@@ -1,212 +1,172 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FormatterApp</name>
     <message>
         <source>Formatter</source>
         <translation>格式化工具</translation>
     </message>
     <message>
         <source>Storage Type</source>
         <translation>儲存類型</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <source>Ok</source>
         <translation>確定</translation>
     </message>
     <message>
         <source>Formatter Output</source>
         <translation>格式化工具輸出</translation>
     </message>
     <message>
         <source>Trying to umount.</source>
         <translation>正在嘗試卸載.</translation>
     </message>
     <message>
         <source>umount failed!</source>
         <translation>卸載失敗!</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>確定(&amp;O)</translation>
     </message>
     <message>
         <source>Could not umount.
 Device is busy!</source>
         <translation>無法卸載.
 裝置忙碌中!</translation>
     </message>
     <message>
         <source>Trying to format.</source>
         <translation>正在嘗試格式化.</translation>
     </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>
         <source>Available: %1 kB ( %d mB)</source>
         <translation>還剩: %1 kB ( %d mB)</translation>
     </message>
     <message>
         <source>CAUTION:
 Changing parameters on this
 page may cause your system
 to stop functioning properly!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Format?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 with %1 filesystem?
 You will loose all data!!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Trying to umount %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Trying to mount %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1
 has been successfully mounted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Storage Type: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type: %1
 Formatted with %2
 %3, %4, %5</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,56 +1,52 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GoMainWidget</name>
     <message>
         <source>New Game</source>
         <translation>新遊戲</translation>
     </message>
     <message>
         <source>Pass</source>
         <translation>Pass</translation>
     </message>
     <message>
         <source>Resign</source>
         <translation>放棄</translation>
     </message>
     <message>
         <source>Two player option</source>
         <translation>Two player 選項</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>遊戲</translation>
     </message>
 </context>
 <context>
     <name>GoWidget</name>
     <message>
         <source>White %1, Black %2. </source>
         <translation>白 %1,黑 %2</translation>
     </message>
     <message>
         <source>White wins.</source>
         <translation>白方勝出.</translation>
     </message>
     <message>
         <source>Black wins.</source>
         <translation>黑方勝出</translation>
     </message>
     <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
@@ -1,68 +1,64 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KBill</name>
     <message>
         <source>kBill</source>
         <translation>K比爾</translation>
     </message>
     <message>
         <source>New game</source>
         <translation>新遊戲</translation>
     </message>
     <message>
         <source>Pause game</source>
         <translation>暫停遊戲</translation>
     </message>
     <message>
         <source>Story of kBill</source>
         <translation>K比爾的故事</translation>
     </message>
     <message>
         <source>Rules</source>
         <translation>規則</translation>
     </message>
     <message>
         <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>
         <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 disguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>UI</name>
     <message>
         <source>After Level</source>
         <translation>經過關卡</translation>
     </message>
     <message>
         <source>Your score</source>
         <translation>您的分數</translation>
     </message>
 </context>
 </TS>
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
@@ -1,295 +1,291 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KRFBConnection</name>
     <message>
         <source>Connected</source>
         <translation>已連線</translation>
     </message>
     <message>
         <source>Connection Refused</source>
         <translation>連線被拒絕</translation>
     </message>
     <message>
         <source>Host not found</source>
         <translation>找不到主機</translation>
     </message>
     <message>
         <source>Read Error: QSocket reported an error reading
 data, the remote host has probably dropped the
 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>
         <source>Protocol Error: An unknown encoding was used by the server %1</source>
         <translation>通訊協定錯誤: 伺服器 %1 使用了未知的編碼</translation>
     </message>
     <message>
         <source>Waiting for server initialization...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KRFBLogin</name>
     <message>
         <source>Waiting for server version...</source>
         <translation>等待伺服器的版本...</translation>
     </message>
     <message>
         <source>Error: Invalid server version, %1</source>
         <translation>錯誤: 無效的伺服器版本, %1</translation>
     </message>
     <message>
         <source>Error: Unsupported server version, %1</source>
         <translation>錯誤: 不支援的伺服器版本, %1</translation>
     </message>
     <message>
         <source>Logged in</source>
         <translation>登入</translation>
     </message>
     <message>
         <source>Error: This server requires a password, but none has been specified.
 </source>
         <translation>錯誤: 這個伺服器需要密碼, 但是您沒有指定.</translation>
     </message>
     <message>
         <source>Error: The password you specified was incorrect.</source>
         <translation>錯誤: 您所指定的密碼不正確.</translation>
     </message>
     <message>
         <source>Error: Too many invalid login attempts have been made
 to this account, please try later.</source>
         <translation>錯誤: 對這個帳號進行了太多次
 無效的登入, 請稍後再嘗試.</translation>
     </message>
     <message>
         <source>Login Failed</source>
         <translation>登入失敗</translation>
     </message>
     <message>
         <source>Too many failures</source>
         <translation>太多次失敗</translation>
     </message>
 </context>
 <context>
     <name>KVNC</name>
     <message>
         <source>VNC Viewer</source>
         <translation>VNC 檢視程式</translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation>全螢幕</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>連線</translation>
     </message>
     <message>
         <source>Stop Full Screen</source>
         <translation>停止全螢幕</translation>
     </message>
     <message>
         <source>Connected to remote host</source>
         <translation>連線至遠端主機</translation>
     </message>
     <message>
         <source>Logged in to remote host</source>
         <translation>登入至遠端主機</translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation>連線已關閉</translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation>新連線</translation>
     </message>
     <message>
         <source>Open Bookmark</source>
         <translation>開啟書籤</translation>
     </message>
     <message>
         <source>Delete Bookmark</source>
         <translation>刪除書籤</translation>
     </message>
     <message>
         <source>Send Contrl-Alt-Delete</source>
         <translation>送出 Contrl-Alt-Delete</translation>
     </message>
     <message>
         <source>Next Click is Double Click</source>
         <translation>下次的點選代表雙擊</translation>
     </message>
     <message>
         <source>Next Click is Right Click</source>
         <translation>下次的點選代表按滑鼠右鍵</translation>
     </message>
 </context>
 <context>
     <name>KVNCBookmarkDlgBase</name>
     <message>
         <source>Bookmarks</source>
         <translation>書籤</translation>
     </message>
     <message>
         <source>Choose a bookmark that you would like to open</source>
         <translation>選擇您想要開啟的書籤</translation>
     </message>
 </context>
 <context>
     <name>KVNCConnDlgBase</name>
     <message>
         <source>VNC Viewer Connection</source>
         <translation>VNC 檢視器連線</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>伺服器</translation>
     </message>
     <message>
         <source>Show Password</source>
         <translation>顯示密碼</translation>
     </message>
     <message>
         <source>Password:</source>
         <translation>密碼:</translation>
     </message>
     <message>
         <source>Bookmark Name:</source>
         <translation>書籤名稱:</translation>
     </message>
     <message>
         <source>Host Name:</source>
         <translation>主機名稱:</translation>
     </message>
     <message>
         <source>Display Number:</source>
         <translation>顯示號碼:</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>選項</translation>
     </message>
     <message>
         <source>Check for screen updates every:</source>
         <translation>檢查螢幕更新於每:</translation>
     </message>
     <message>
         <source>Milliseconds</source>
         <translation>毫秒</translation>
     </message>
     <message>
         <source>Request 8-bit session</source>
         <translation>要求 8 位元工作階段</translation>
     </message>
     <message>
         <source>Raise on bell</source>
         <translation>遠端有嗶聲時帶起本視窗</translation>
     </message>
     <message>
         <source>Request shared session</source>
         <translation>要求共享的工作階段</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>Scale Factor</source>
         <translation>縮放控制元</translation>
     </message>
     <message>
         <source>Encodings</source>
         <translation>編碼</translation>
     </message>
     <message>
         <source>Hextile encoding</source>
         <translation>Hextile 編碼</translation>
     </message>
     <message>
         <source>CoRRE encoding</source>
         <translation>CoRRE 編碼</translation>
     </message>
     <message>
         <source>RRE encoding</source>
         <translation>RRE 編碼</translation>
     </message>
     <message>
         <source>Copy rectangle encoding</source>
         <translation>複製矩形區編碼</translation>
     </message>
     <message>
         <source>The password of the VNC server</source>
         <translation>這個 VNC 伺服器的密碼</translation>
     </message>
     <message>
         <source>Toggle obscuring the password</source>
         <translation>切換密碼隱藏</translation>
     </message>
     <message>
         <source>The name of the VNC server</source>
         <translation>VNC 伺服器的名稱</translation>
     </message>
     <message>
         <source>The host name of the VNC server</source>
         <translation>VNC 伺服器的主機名稱</translation>
     </message>
     <message>
         <source>The display number of the VNC server</source>
         <translation>VNC 伺服器的顯示號碼</translation>
     </message>
     <message>
         <source>Delay between requesting updates from the server</source>
         <translation>延遲與伺服器之間的更新要求</translation>
     </message>
     <message>
         <source>Request that the VNC server transfer 8 bit color</source>
         <translation>要求 VNC 伺服器傳送 8 位元色彩</translation>
     </message>
     <message>
         <source>Allow other users to connect to the VNC server</source>
         <translation>允許其他使用者連線到 VNC 伺服器</translation>
     </message>
     <message>
         <source>Scale the remote display to fit on the PDA (Slow)</source>
         <translation>縮放遠端顯示以符合 PDA (較慢)</translation>
     </message>
     <message>
         <source>Enable transmiting identical rectangles as references to existing data</source>
         <translation>啟用傳送一致的矩形區做為既存資料的參照</translation>
     </message>
 </context>
 </TS>
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,98 +1,86 @@
 <!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>
         <source>Very Low</source>
         <translation>非常低</translation>
     </message>
     <message>
         <source>Critical</source>
         <translation>臨界的</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>未知</translation>
     </message>
     <message>
         <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>
         <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>
         <source>Remaining Power: %1%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remaining Time: %1m %2s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remaing Power: %1 %2
 Remaining Time: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ipaq  %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,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>
     </message>
     <message>
         <source>No translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
         <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>
     </message>
 </context>
 </TS>
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
@@ -1,750 +1,601 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>OPimRecurrenceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished">Repeating Event</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">無</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">日</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished">星期</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished">月份</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished">年份</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished">每:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished">重復的</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished">End On:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">No End Date</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">在某天重復</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">星期一</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">星期二</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">星期三</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">星期四</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">星期五</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">星期六</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">星期日</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">每</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished">WeekVar</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">No End Date</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">在某天重復</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">星期一</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">星期二</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">星期三</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">星期四</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">星期五</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">星期六</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">星期日</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">日</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">每</translation>
     </message>
 </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>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to edit the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to duplicate the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to delete the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to transmit the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</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>QObject</name>
     <message>
         <source>Priority:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Children: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">每</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Very high</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Very low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 %2 of every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation type="unfinished"></translation>
     </message>
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,313 +1,175 @@
 <!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>
     </message>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished"></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="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>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>
         <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>
 </TS>
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
@@ -1,1034 +1,992 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation>全部</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>未歸檔</translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation> (多個.)</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>商務</translation>
     </message>
     <message>
         <source>Personal</source>
         <translation>個人</translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation> (多個.)</translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation>全部</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>新增類別</translation>
     </message>
     <message>
         <source>New Category </source>
         <translation>新類別</translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation>類別編輯</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>類別</translation>
     </message>
     <message>
         <source>Application</source>
         <translation>應用程式</translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation>類別到這裡</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>新增</translation>
     </message>
     <message>
         <source>Global</source>
         <translation>全域</translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation>核取這個文件所屬的類別.</translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation>在這裡輸入新的類別. 按 &lt;b&gt;新增&lt;/b&gt; 來把它加到清單中.</translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation>在左邊輸入新類別並按下以便將它加入清單.</translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation>按下以刪除反白的類別.</translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation>核取以便讓所有的應用程式可以使用這個內容.</translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation>全部</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>未歸檔</translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation>錯誤</translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation>對不起, 另一個應用程式正在
 編輯類別.</translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation>編輯類別</translation>
     </message>
     <message>
         <source>All</source>
         <translation>全部</translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation>顯示所選年份中的一月</translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation>顯示上個月</translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation>顯示下個月</translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation>顯示所選年份中的十二月</translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation>關閉檔案選擇器</translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation>顯示這個類型的文件</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>文件檢視</translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation>顯示這個類別中的文件</translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation>按一下以便自清單中選擇文件</translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation>, 或選 &lt;b&gt;新增文件&lt;/b&gt; 來建立一個新文件.</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation>&lt;br&gt;&lt;br&gt;按住並停留以獲知文件內容.</translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation>名稱</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <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>
         <source>Find what:</source>
         <translation>尋找什麼:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>類別:</translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation>開始搜尋於:</translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation>Dec 02 01</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>區分大小寫</translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation>向後搜尋</translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Document View</source>
         <translation>文件檢視</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>刪除</translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation>檔案偵測失敗.</translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation>複製於 </translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>重製</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>檔案複製失敗.</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>詳細資料</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>移動文件失敗.</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>硬碟</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>內容</translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation>詳細資料</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>註解:</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>類型:</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>名稱:</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>位置</translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation>快速載入 (消耗記憶體)</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>刪除</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>複製</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>紅外線</translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation>存放此文件的媒體.</translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation>這個文件的名稱.</translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation>預先載入此應用程式以便能馬上使用它.</translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation>刪除這個文件.</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation>製作這個文件的副本.</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation>將這個文件傳輸到另一個裝置.</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation>使用自訂旋轉</translation>
     </message>
     <message>
         <source>Arguments:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>擁有者資訊</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>確定</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>輸入通行碼</translation>
     </message>
 </context>
 <context>
     <name>QMessageBox</name>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation>空間不足</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>在為這個程式建立
 組態資訊
 時發生問題.
 
 請釋放一些空間並
 再試一次.</translation>
     </message>
     <message>
         <source>Unable to create start up files
 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>
         <source>year</source>
         <translation>年</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>一</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>二</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>三</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>四</translation>
     </message>
     <message>
         <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>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;住家地阯:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation>電子郵件位址: </translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>住家電話: </translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>住家傳真: </translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>住家行動電話: </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>個人網頁: </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>商務網頁: </translation>
     </message>
     <message>
         <source>Office: </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>Profession: </source>
         <translation>職業: </translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>助理:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>經理: </translation>
     </message>
     <message>
         <source>Male</source>
         <translation>男性</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>女性</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>性別: </translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>配偶: </translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>生日: </translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>周年紀念日: </translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>暱稱: </translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>名稱 頭銜</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>名</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>中名</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>姓</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>稱呼</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>歸檔為</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>職稱</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>部門</translation>
     </message>
     <message>
         <source>Company</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>Default Email</source>
         <translation>預設電子郵件</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>電子郵件</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>住家電話</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>住家傳真</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>住家行動電話</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>辦公處 街道</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>辦公處 城市</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>辦公處 州</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>辦公處 郵遞區號</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>辦公處 國家</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>商務呼叫器</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>商務網址</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>辦公室</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>職業</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>助理</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>經理</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>住家 街道</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>住家 城市</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>住家 州</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>住家 郵遞區號</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>住家 國家</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>個人網頁</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>配偶</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>性別</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>生日</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>周年紀念日</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>暱稱</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>子女</translation>
     </message>
     <message>
         <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>
     <message>
         <source>Jan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>May</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jul</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oct</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nov</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation type="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>
     <message>
         <source>%1 document</source>
         <translation>%1 文件</translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation type="unfinished">按這裡關閉這個視窗, 放棄所做的變更.</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation type="unfinished">按這裡關閉視窗.</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation type="unfinished">按這裡關閉視窗並接受所有的變更.</translation>
     </message>
     <message>
         <source>Click to make this window movable.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
         <translation type="unfinished">按這裡讓這個視窗使用所有可用的螢幕區域.</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maximize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>CF 卡</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>硬碟</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>SD 卡</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>SCSI 硬碟</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>內部儲存空間</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>內部記憶體</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>MMC 卡</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>無</translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation>找不到 城市時間 可執行檔</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation>為了選擇時區,
 請安裝城市時間.</translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>空間不足</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>無法排程警示.
 請釋放空間後再試一次</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>%1 檔案</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>%1 %2</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>全部 %1 個檔案</translation>
     </message>
     <message>
         <source>All files</source>
         <translation>所有檔案</translation>
     </message>
 </context>
 <context>
     <name>WindowDecoration</name>
     <message>
         <source>Default</source>
         <comment>List box text for default window decoration</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,48 +1,36 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MindBreaker</name>
     <message>
         <source>New Game</source>
         <translation>新遊戲</translation>
     </message>
     <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>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
 </context>
 </TS>
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,37 +1,33 @@
 <!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>
         <source>Game</source>
         <translation>遊戲</translation>
     </message>
     <message>
         <source>Mine Sweep</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,300 +1,328 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BaseSetup</name>
     <message>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slideshow timeout:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Toggle autoscale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to next image</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Delete Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Image Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></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>Browser Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Keyboard Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie Eye - Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Imageinfo Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Imageview Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Go dir up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start slideshow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and Imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show images fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto rotate images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show images unscaled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show zoomer window when unscaled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
     <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>
         <source>&lt;center&gt;&lt;b&gt;Be carefull with the following options!&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show files recursive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recursion depth:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Digital Camera View</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <source>Name Only</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>imageinfo</name>
     <message>
         <source>View Full Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays an thumbnail of the image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays info of selected image</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/opie-login.ts b/i18n/zh_TW/opie-login.ts
index de40df3..375c2aa 100644
--- a/i18n/zh_TW/opie-login.ts
+++ b/i18n/zh_TW/opie-login.ts
@@ -1,144 +1,123 @@
 <!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>
         <source>User</source>
         <translation>使用者</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>密碼</translation>
     </message>
     <message>
         <source>Suspend</source>
         <translation>暫停</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>選單</translation>
     </message>
 </context>
 <context>
     <name>LoginWindowImpl</name>
     <message>
         <source>Restart</source>
         <translation>重新啟動</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>離開</translation>
     </message>
     <message>
-        <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
-        <translation type="obsolete">&lt;center&gt;%1 %2&lt;/center&gt;</translation>
-    </message>
-    <message>
         <source>Wrong password</source>
         <translation>錯誤的密碼</translation>
     </message>
     <message>
         <source>The given password is incorrect.</source>
         <translation>輸入的密碼不正確.</translation>
     </message>
     <message>
-        <source>OPIE was terminated
-by an uncaught signal
-(%1)
-</source>
-        <translation type="obsolete">OPIE 被沒有抓到的信號
-(%1) 
-中止了</translation>
-    </message>
-    <message>
         <source>Failure</source>
         <translation>失敗</translation>
     </message>
     <message>
-        <source>Could not start OPIE.</source>
-        <translation type="obsolete">無法啟動 OPIE.</translation>
-    </message>
-    <message>
         <source>Could not switch to new user identity</source>
         <translation>無法切換為新的使用者身分</translation>
     </message>
     <message>
         <source>Opie was terminated
 by an uncaught signal
 (%1)
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not start Opie.</source>
         <translation type="unfinished"></translation>
     </message>
 </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>
     <message>
         <source>&lt;b&gt;Password:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Confirm:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PasswordDialogImpl</name>
     <message>
         <source>Trying to leave without password set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;No password was set. This could lead to you not beeingable to remotely connect to your machine.Do you want to continue not setting a password?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passwords don&apos;t match</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The two passwords don&apos;t match. Please try again.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password not legal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The entered password is not a valid password.Please try entering a valid password.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,1223 +1,1027 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CellFormat</name>
     <message>
         <source>&amp;Borders</source>
         <translation>框線(&amp;B)</translation>
     </message>
     <message>
         <source>Back&amp;ground</source>
         <translation>背景(&amp;G)</translation>
     </message>
     <message>
         <source>&amp;Font</source>
         <translation>字型(&amp;F)</translation>
     </message>
     <message>
         <source>&amp;Alignment</source>
         <translation>對齊方式(&amp;A)</translation>
     </message>
     <message>
         <source>&amp;Width:</source>
         <translation>寬度(&amp;W):</translation>
     </message>
     <message>
         <source>&amp;Color:</source>
         <translation>顏色(&amp;C):</translation>
     </message>
     <message>
         <source>&amp;Default Borders</source>
         <translation>預設框線(&amp;D)</translation>
     </message>
     <message>
         <source>&amp;Style:</source>
         <translation>樣式(&amp;S):</translation>
     </message>
     <message>
         <source>&amp;Default Background</source>
         <translation>預設背景(&amp;D)</translation>
     </message>
     <message>
         <source>&amp;Font:</source>
         <translation>字型(&amp;F):</translation>
     </message>
     <message>
         <source>&amp;Size:</source>
         <translation>大小(&amp;S):</translation>
     </message>
     <message>
         <source>&amp;Bold</source>
         <translation>粗體(&amp;B)</translation>
     </message>
     <message>
         <source>&amp;Italic</source>
         <translation>斜體(&amp;I)</translation>
     </message>
     <message>
         <source>&amp;Default Font</source>
         <translation>預設字型(&amp;D)</translation>
     </message>
     <message>
         <source>&amp;Vertical:</source>
         <translation>垂直(&amp;V):</translation>
     </message>
     <message>
         <source>&amp;Horizontal:</source>
         <translation>水平(&amp;H):</translation>
     </message>
     <message>
         <source>&amp;Word Wrap</source>
         <translation>自動換行(&amp;W)</translation>
     </message>
     <message>
         <source>&amp;Default Alignment</source>
         <translation>預設對齊方式(&amp;D)</translation>
     </message>
     <message>
         <source>Format Cells</source>
         <translation>格式化儲存格</translation>
     </message>
     <message>
         <source>Opie Sheet</source>
         <translation>Opie 試算表</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>&amp;Find &amp;&amp; Replace</source>
         <translation>尋找 &amp;&amp; 取代(&amp;F)</translation>
     </message>
     <message>
         <source>&amp;Options</source>
         <translation>選項(&amp;O)</translation>
     </message>
     <message>
         <source>&amp;Search for:</source>
         <translation>搜尋目標(&amp;S):</translation>
     </message>
     <message>
         <source>&amp;Replace with:</source>
         <translation>取代為(&amp;R):</translation>
     </message>
     <message>
         <source>&amp;Type</source>
         <translation>類型(&amp;T)</translation>
     </message>
     <message>
         <source>&amp;Find</source>
         <translation>尋找(&amp;F)</translation>
     </message>
     <message>
         <source>&amp;Replace</source>
         <translation>取代(&amp;R)</translation>
     </message>
     <message>
         <source>Replace &amp;all</source>
         <translation>全部取代(&amp;A)</translation>
     </message>
     <message>
         <source>Match &amp;case</source>
         <translation>區分大小寫(&amp;C)</translation>
     </message>
     <message>
         <source>Current &amp;selection only</source>
         <translation>只有目前的選擇區(&amp;S)</translation>
     </message>
     <message>
         <source>&amp;Entire cell</source>
         <translation>整個儲存格(&amp;E)</translation>
     </message>
     <message>
         <source>Find &amp; Replace</source>
         <translation>尋找 &amp; 取代</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Opie Sheet</source>
         <translation>Opie 試算表</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>錯誤</translation>
     </message>
     <message>
         <source>Inconsistency error!</source>
         <translation>無法協調的錯誤!</translation>
     </message>
     <message>
         <source>File cannot be saved!</source>
         <translation>不能儲存檔案!</translation>
     </message>
     <message>
         <source>File cannot be opened!</source>
         <translation>不能開啟檔案!</translation>
     </message>
     <message>
         <source>Invalid file format!</source>
         <translation>無效的檔案格式!</translation>
     </message>
     <message>
         <source>Save File</source>
         <translation>儲存檔案</translation>
     </message>
     <message>
         <source>Do you want to save the current file?</source>
         <translation>您想要儲存目前的檔案嗎?</translation>
     </message>
     <message>
         <source>&amp;File Name:</source>
         <translation>檔案名稱(&amp;F):</translation>
     </message>
     <message>
         <source>UnnamedFile</source>
         <translation>未命名的檔案</translation>
     </message>
     <message>
         <source>New File</source>
         <translation>開新檔案</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>新增(&amp;N)</translation>
     </message>
     <message>
         <source>Open File</source>
         <translation>開啟檔案</translation>
     </message>
     <message>
         <source>&amp;Open</source>
         <translation>開啟(&amp;O)</translation>
     </message>
     <message>
         <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>
         <source>&amp;Cancel</source>
         <translation>取消(&amp;C)</translation>
     </message>
     <message>
         <source>Cell Selector</source>
         <translation>儲存格選擇器</translation>
     </message>
     <message>
         <source>Cell &amp;Selector</source>
         <translation>儲存格選擇器(&amp;S)</translation>
     </message>
     <message>
         <source>Cut Cells</source>
         <translation>剪下儲存格</translation>
     </message>
     <message>
         <source>Cu&amp;t</source>
         <translation>剪下(&amp;T)</translation>
     </message>
     <message>
         <source>Copy Cells</source>
         <translation>複製儲存格</translation>
     </message>
     <message>
         <source>&amp;Copy</source>
         <translation>複製(&amp;C)</translation>
     </message>
     <message>
         <source>Paste Cells</source>
         <translation>貼上儲存格</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>貼上(&amp;P)</translation>
     </message>
     <message>
         <source>Paste Contents</source>
         <translation>貼上內容</translation>
     </message>
     <message>
         <source>Paste Cont&amp;ents</source>
         <translation>貼上內容(&amp;E)</translation>
     </message>
     <message>
         <source>Clear Cells</source>
         <translation>清除儲存格</translation>
     </message>
     <message>
         <source>C&amp;lear</source>
         <translation>清除(&amp;L)</translation>
     </message>
     <message>
         <source>Insert Cells</source>
         <translation>插入儲存格</translation>
     </message>
     <message>
         <source>C&amp;ells</source>
         <translation>儲存格(&amp;E)</translation>
     </message>
     <message>
         <source>Insert Rows</source>
         <translation>插入列</translation>
     </message>
     <message>
         <source>&amp;Rows</source>
         <translation>列(&amp;R)</translation>
     </message>
     <message>
         <source>Insert Columns</source>
         <translation>插入欄</translation>
     </message>
     <message>
         <source>&amp;Columns</source>
         <translation>欄(&amp;C)</translation>
     </message>
     <message>
         <source>Add Sheets</source>
         <translation>新增工作表</translation>
     </message>
     <message>
         <source>&amp;Sheets</source>
         <translation>工作表(&amp;S)</translation>
     </message>
     <message>
         <source>Cells</source>
         <translation>儲存格</translation>
     </message>
     <message>
         <source>&amp;Cells</source>
         <translation>儲存格(&amp;C)</translation>
     </message>
     <message>
         <source>Row Height</source>
         <translation>列高</translation>
     </message>
     <message>
         <source>H&amp;eight</source>
         <translation>高度(&amp;E)</translation>
     </message>
     <message>
         <source>Adjust Row</source>
         <translation>調整列</translation>
     </message>
     <message>
         <source>&amp;Adjust</source>
         <translation>調整(&amp;A)</translation>
     </message>
     <message>
         <source>Show Row</source>
         <translation>顯示列</translation>
     </message>
     <message>
         <source>&amp;Show</source>
         <translation>顯示(&amp;S)</translation>
     </message>
     <message>
         <source>Hide Row</source>
         <translation>隱藏列</translation>
     </message>
     <message>
         <source>&amp;Hide</source>
         <translation>隱藏(&amp;H)</translation>
     </message>
     <message>
         <source>Column Width</source>
         <translation>欄寬</translation>
     </message>
     <message>
         <source>&amp;Width</source>
         <translation>寬度(&amp;W)</translation>
     </message>
     <message>
         <source>Adjust Column</source>
         <translation>調整欄</translation>
     </message>
     <message>
         <source>Show Column</source>
         <translation>顯示欄</translation>
     </message>
     <message>
         <source>Hide Column</source>
         <translation>隱藏欄</translation>
     </message>
     <message>
         <source>Rename Sheet</source>
         <translation>重新命名工作表</translation>
     </message>
     <message>
         <source>&amp;Rename</source>
         <translation>重新命名(&amp;R)</translation>
     </message>
     <message>
         <source>Remove Sheet</source>
         <translation>移除工作表</translation>
     </message>
     <message>
         <source>R&amp;emove</source>
         <translation>移除(&amp;E)</translation>
     </message>
     <message>
         <source>Sort Data</source>
         <translation>排序資料</translation>
     </message>
     <message>
         <source>&amp;Sort</source>
         <translation>排序(&amp;S)</translation>
     </message>
     <message>
         <source>Find &amp;&amp; Replace</source>
         <translation>尋找 &amp;&amp; 取代</translation>
     </message>
     <message>
         <source>&amp;Find &amp;&amp; Replace</source>
         <translation>尋找 &amp;&amp; 取代(&amp;F)</translation>
     </message>
     <message>
         <source>Equal To</source>
         <translation>等同於</translation>
     </message>
     <message>
         <source>&amp;Equal To</source>
         <translation>等同於(&amp;E)</translation>
     </message>
     <message>
         <source>Addition</source>
         <translation>加</translation>
     </message>
     <message>
         <source>&amp;Addition</source>
         <translation>加(&amp;A)</translation>
     </message>
     <message>
         <source>Subtraction</source>
         <translation>減</translation>
     </message>
     <message>
         <source>&amp;Subtraction</source>
         <translation>減(&amp;S)</translation>
     </message>
     <message>
         <source>Multiplication</source>
         <translation>乘</translation>
     </message>
     <message>
         <source>&amp;Multiplication</source>
         <translation>乘(&amp;M)</translation>
     </message>
     <message>
         <source>Division</source>
         <translation>除</translation>
     </message>
     <message>
         <source>&amp;Division</source>
         <translation>除(&amp;D)</translation>
     </message>
     <message>
         <source>Open ParanthesistempCellData-&gt;row+row1, tempCellData-&gt;col+col1</source>
         <translation>開啟 ParanthesistempCellData-&gt;列+列1, tempCellData-&gt;欄+欄1</translation>
     </message>
     <message>
         <source>&amp;Open Paranthesis</source>
         <translation>開啟 Paranthesis(&amp;O)</translation>
     </message>
     <message>
         <source>Close Paranthesis</source>
         <translation>關閉 Paranthesis</translation>
     </message>
     <message>
         <source>&amp;Close Paranthesis</source>
         <translation>關閉 Paranthesis(&amp;C)</translation>
     </message>
     <message>
         <source>Comma</source>
         <translation>逗號</translation>
     </message>
     <message>
         <source>&amp;Comma</source>
         <translation>逗號(&amp;C)</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>檔案(&amp;F)</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>編輯(&amp;E)</translation>
     </message>
     <message>
         <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>
         <source>Sheet</source>
         <translation>工作表</translation>
     </message>
     <message>
         <source>&amp;Height of each row:</source>
         <translation>每列的高度(&amp;H):</translation>
     </message>
     <message>
         <source>&amp;Width of each column:</source>
         <translation>每欄的寬度(&amp;W):</translation>
     </message>
     <message>
         <source>&amp;Sheet Name:</source>
         <translation>工作表名稱(&amp;S):</translation>
     </message>
     <message>
         <source>There is only one sheet!</source>
         <translation>這裡只有一個工作表!</translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation>您確定嗎?</translation>
     </message>
     <message>
         <source>&amp;Type</source>
         <translation>類型(&amp;T)</translation>
     </message>
     <message>
         <source>Shift cells &amp;down</source>
         <translation>儲存格下移(&amp;D)</translation>
     </message>
     <message>
         <source>Shift cells &amp;right</source>
         <translation>儲存格右移(&amp;R)</translation>
     </message>
     <message>
         <source>Entire ro&amp;w</source>
         <translation>整列(&amp;W)</translation>
     </message>
     <message>
         <source>Entire &amp;column</source>
         <translation>整欄(&amp;C)</translation>
     </message>
     <message>
         <source>Import Excel file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import E&amp;xcel file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Simple</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ABS(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CEILING(x,acc)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FACT(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FLOOR(x,acc)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>INT(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MOD(x,y)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ROUND(x,digits)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SIGN(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>EXP(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>LN(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>LOG(x,b)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>LOG10(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>POWER(x,y)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SQRT(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DEGREES(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RADIANS(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PI()</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RAND()</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RANDBETWEEN(a,b)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S&amp;tandard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AND(x1,x2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>NOT(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OR(x1,x2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IF(compare,val1,val2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>INDEX(range,index)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ISBLANK(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ISNUMBER(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>EVEN(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ISEVEN(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ODD(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ISODD(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Logical-&amp;Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SIN(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>COS(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>TAN(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ASIN(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ACOS(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ATAN(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ATAN2(x,y)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SINH(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>COSH(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>TANH(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ACOSH(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ASINH(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ATANH(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Trigonometric</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>LEN(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>LEFT(s,num)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RIGHT(s,num)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MID(s,pos,len)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CONCATENATE(s1,s2..)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>EXACT(s1,s2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FIND(what,where,pos)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>REPLACE(s,pos,len,ns)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>REPT(s,n)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>UPPER(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>LOWER(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Strings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AVERAGE(range)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>COUNT(range)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>COUNTIF(range,eqls)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAX(range)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MIN(range)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SUM(range)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SUMSQ(range)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>VAR(range)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>VARP(range)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>STDEV(range)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>STDEVP(range)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SKEW(range)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>KURT(range)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sta&amp;tistical</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BESSELI(x,n)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BESSELJ(x,n)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BESSELK(x,n)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BESSELY(x,n)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BETAI(x,a,b)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ERF(a,b)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ERFC(a,b)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>GAMMALN(x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>GAMMAP(x,a)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>GAMMAQ(x,a)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scienti&amp;fic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BETADIST(z,a,b,Q?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CHI2DIST(x,n,Q?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CHIDIST(x,n,Q?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FDIST(z,deg1,deg2,Q?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>GAMMADIST(x,a,b,Q?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>NORMALDIST(x,m,s,Q?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PHI(x,Q?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>POISSON(x,n,Q?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Distributions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie Sheet
 Spreadsheet Software for Opie
 QWDC Beta Winner (as Sheet/Qt)
 
 Developed by: Serdar Ozler
 Release 1.0.2
 Release Date: October 08, 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="unfinished"></translation>
     </message>
     <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>
         <translation>選項(&amp;O)</translation>
     </message>
     <message>
         <source>&amp;Sort by</source>
         <translation>排序依(&amp;S)</translation>
     </message>
     <message>
         <source>&amp;Then by</source>
         <translation>接著依(&amp;T)</translation>
     </message>
     <message>
         <source>Then &amp;by</source>
         <translation>然後依(&amp;B)</translation>
     </message>
     <message>
         <source>&amp;Case Sensitive</source>
         <translation>區分大小寫(&amp;C)</translation>
     </message>
     <message>
         <source>&amp;Direction</source>
         <translation>方向(&amp;D)</translation>
     </message>
     <message>
         <source>&amp;Top to bottom (rows)</source>
         <translation>頂端到底部(列)(&amp;T)</translation>
     </message>
     <message>
         <source>&amp;Left to right (columns)</source>
         <translation>左邊到右邊(欄)(&amp;L)</translation>
     </message>
     <message>
         <source>Sort</source>
         <translation>排序</translation>
     </message>
     <message>
         <source>&amp;Ascending</source>
         <translation>遞增(&amp;A)</translation>
     </message>
     <message>
         <source>&amp;Descending</source>
         <translation>遞減(&amp;D)</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>錯誤</translation>
     </message>
     <message>
         <source>One cell cannot be sorted!</source>
         <translation>只有一個儲存格不能排序!</translation>
     </message>
 </context>
 </TS>
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,1160 +1,878 @@
 <!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>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerUI</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished">取消</translation>
     </message>
 </context>
 <context>
     <name>ComposeMail</name>
     <message>
         <source>Name</source>
         <translation type="unfinished">名稱</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please create an SMTP account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a File.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Store message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Store message into drafts?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Attachments will not be stored in &quot;Draft&quot; folder&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Receiver specified</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposeMailUI</name>
     <message>
         <source>Compose Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>send later</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>use:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished">郵件</translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished">主旨</translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished">收件者</translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BCC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC</source>
         <translation type="unfinished">副本</translation>
     </message>
     <message>
         <source>Attachment</source>
         <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>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete the selected Account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select an account.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccountsUI</name>
     <message>
         <source>Configure Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished">郵件</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">刪除</translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>News</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IMAPconfigUI</name>
     <message>
         <source>Configure IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished">使用者</translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished">密碼</translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished">連接埠</translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished">伺服器</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefix</source>
         <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>
     </message>
     <message>
         <source>Send queued mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show/Hide folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished">主旨</translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Newsgroups</source>
         <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>
     </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>
 <context>
     <name>NNTPconfigUI</name>
     <message>
         <source>Configure NNTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished">連接埠</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished">伺服器</translation>
     </message>
     <message>
         <source>Use SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished">使用者</translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished">密碼</translation>
     </message>
     <message>
         <source>Use Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Newsgroup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get newsgroup list from server</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Newmdirdlgui</name>
     <message>
         <source>Enter directory name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directory name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directory contains other subdirs</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <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>
     </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>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></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>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>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished">伺服器</translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished">連接埠</translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec imapd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished">使用者</translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished">密碼</translation>
     </message>
     <message>
         <source>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>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>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the SMTP Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished">密碼</translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished">連接埠</translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished">伺服器</translation>
     </message>
     <message>
         <source>Port of the SMTP Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished">使用者</translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SelectMailTypeUI</name>
     <message>
         <source>Select Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Account Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>POP3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SMTP</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SettingsDialogUI</name>
     <message>
         <source>Settings Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View mail as Html</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compose Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mails later ( enqueue in outbox )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished">收件者</translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">日期</translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></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>
     </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>
     </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>
     </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>
     </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>
     </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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Store mail(s) to&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Folder:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create new folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefix will prepend, no need to enter it!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move mail(s)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,451 +1,439 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CalcDlg</name>
     <message>
         <source>Calculate</source>
         <translation>計算</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>清除</translation>
     </message>
     <message>
         <source>Molecular Weight</source>
         <translation>分子量</translation>
     </message>
     <message>
         <source>Chemical Formula</source>
         <translation>化學式</translation>
     </message>
     <message>
         <source>Molecular Weight (u):</source>
         <translation>分子量 (u):</translation>
     </message>
     <message>
         <source>Elemental Composition (%):</source>
         <translation>元素成分 (%):</translation>
     </message>
     <message>
         <source>CalcDlg</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OxydataWidget</name>
     <message>
         <source>Block</source>
         <translation>區塊</translation>
     </message>
     <message>
         <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>
         <source>%1 pm</source>
         <translation>%1 pm</translation>
     </message>
     <message>
         <source>%1 g/cm^3</source>
         <translation>%1 g/cm^3</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation type="unfinished"></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>
 <context>
     <name>Oxygen</name>
     <message>
         <source>Oxygen</source>
         <translation>Oxygen</translation>
     </message>
     <message>
         <source>PSE</source>
         <translation>PSE</translation>
     </message>
     <message>
         <source>Data</source>
         <translation>資料</translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation>計算結果</translation>
     </message>
     <message>
         <source>Hydrogen</source>
         <translation type="unfinished">氫</translation>
     </message>
     <message>
         <source>Helium</source>
         <translation type="unfinished">氦</translation>
     </message>
     <message>
         <source>Lithium</source>
         <translation type="unfinished">鋰</translation>
     </message>
     <message>
         <source>Beryllium</source>
         <translation type="unfinished">鈹</translation>
     </message>
     <message>
         <source>Boron</source>
         <translation type="unfinished">硼</translation>
     </message>
     <message>
         <source>Carbon</source>
         <translation type="unfinished">碳</translation>
     </message>
     <message>
         <source>Nitrogen</source>
         <translation type="unfinished">氮</translation>
     </message>
     <message>
         <source>Fluorine</source>
         <translation type="unfinished">氟</translation>
     </message>
     <message>
         <source>Neon</source>
         <translation type="unfinished">氖</translation>
     </message>
     <message>
         <source>Sodium</source>
         <translation type="unfinished">鈉</translation>
     </message>
     <message>
         <source>Magnesium</source>
         <translation type="unfinished">鎂</translation>
     </message>
     <message>
         <source>Aluminum</source>
         <translation type="unfinished">鋁</translation>
     </message>
     <message>
         <source>Silicon</source>
         <translation type="unfinished">矽</translation>
     </message>
     <message>
         <source>Phosphorus</source>
         <translation type="unfinished">磷</translation>
     </message>
     <message>
         <source>Sulfur</source>
         <translation type="unfinished">硫</translation>
     </message>
     <message>
         <source>Chlorine</source>
         <translation type="unfinished">氯</translation>
     </message>
     <message>
         <source>Argon</source>
         <translation type="unfinished">氬</translation>
     </message>
     <message>
         <source>Potassium</source>
         <translation type="unfinished">鉀</translation>
     </message>
     <message>
         <source>Calcium</source>
         <translation type="unfinished">鈣</translation>
     </message>
     <message>
         <source>Scandium</source>
         <translation type="unfinished">鈧</translation>
     </message>
     <message>
         <source>Titanium</source>
         <translation type="unfinished">鈦</translation>
     </message>
     <message>
         <source>Vanadium</source>
         <translation type="unfinished">釩</translation>
     </message>
     <message>
         <source>Chromium</source>
         <translation type="unfinished">鉻</translation>
     </message>
     <message>
         <source>Manganese</source>
         <translation type="unfinished">錳</translation>
     </message>
     <message>
         <source>Iron</source>
         <translation type="unfinished">鐵</translation>
     </message>
     <message>
         <source>Cobalt</source>
         <translation type="unfinished">鈷</translation>
     </message>
     <message>
         <source>Nickel</source>
         <translation type="unfinished">鎳</translation>
     </message>
     <message>
         <source>Copper</source>
         <translation type="unfinished">銅</translation>
     </message>
     <message>
         <source>Zinc</source>
         <translation type="unfinished">鋅</translation>
     </message>
     <message>
         <source>Gallium</source>
         <translation type="unfinished">鎵</translation>
     </message>
     <message>
         <source>Germanium</source>
         <translation type="unfinished">鍺</translation>
     </message>
     <message>
         <source>Arsenic</source>
         <translation type="unfinished">砷</translation>
     </message>
     <message>
         <source>Selenium</source>
         <translation type="unfinished">硒</translation>
     </message>
     <message>
         <source>Bromine</source>
         <translation type="unfinished">溴</translation>
     </message>
     <message>
         <source>Krypton</source>
         <translation type="unfinished">氪</translation>
     </message>
     <message>
         <source>Rubidium</source>
         <translation type="unfinished">銣</translation>
     </message>
     <message>
         <source>Strontium</source>
         <translation type="unfinished">鍶</translation>
     </message>
     <message>
         <source>Yttrium</source>
         <translation type="unfinished">釔</translation>
     </message>
     <message>
         <source>Zirconium</source>
         <translation type="unfinished">鋯</translation>
     </message>
     <message>
         <source>Niobium</source>
         <translation type="unfinished">鈮</translation>
     </message>
     <message>
         <source>Molybdenum</source>
         <translation type="unfinished">鉬</translation>
     </message>
     <message>
         <source>Technetium</source>
         <translation type="unfinished">鎝</translation>
     </message>
     <message>
         <source>Ruthenium</source>
         <translation type="unfinished">釕</translation>
     </message>
     <message>
         <source>Rhodium</source>
         <translation type="unfinished">銠</translation>
     </message>
     <message>
         <source>Palladium</source>
         <translation type="unfinished">鈀</translation>
     </message>
     <message>
         <source>Silver</source>
         <translation type="unfinished">銀</translation>
     </message>
     <message>
         <source>Cadmium</source>
         <translation type="unfinished">鎘</translation>
     </message>
     <message>
         <source>Indium</source>
         <translation type="unfinished">銦</translation>
     </message>
     <message>
         <source>Tin</source>
         <translation type="unfinished">錫</translation>
     </message>
     <message>
         <source>Antimony</source>
         <translation type="unfinished">銻</translation>
     </message>
     <message>
         <source>Tellurium</source>
         <translation type="unfinished">碲</translation>
     </message>
     <message>
         <source>Iodine</source>
         <translation type="unfinished">碘</translation>
     </message>
     <message>
         <source>Xenon</source>
         <translation type="unfinished">氙</translation>
     </message>
     <message>
         <source>Cesium</source>
         <translation type="unfinished">銫</translation>
     </message>
     <message>
         <source>Barium</source>
         <translation type="unfinished">鋇</translation>
     </message>
     <message>
         <source>Lanthanum</source>
         <translation type="unfinished">鑭</translation>
     </message>
     <message>
         <source>Cerium</source>
         <translation type="unfinished">鈰</translation>
     </message>
     <message>
         <source>Praseodymium</source>
         <translation type="unfinished">鐠</translation>
     </message>
     <message>
         <source>Neodymium</source>
         <translation type="unfinished">釹</translation>
     </message>
     <message>
         <source>Promethium</source>
         <translation type="unfinished">鉅</translation>
     </message>
     <message>
         <source>Samarium</source>
         <translation type="unfinished">釤</translation>
     </message>
     <message>
         <source>Europium</source>
         <translation type="unfinished">銪</translation>
     </message>
     <message>
         <source>Gadolinium</source>
         <translation type="unfinished">釓</translation>
     </message>
     <message>
         <source>Terbium</source>
         <translation type="unfinished">鋱</translation>
     </message>
     <message>
         <source>Dysprosium</source>
         <translation type="unfinished">鏑</translation>
     </message>
     <message>
         <source>Holmium</source>
         <translation type="unfinished">鈥</translation>
     </message>
     <message>
         <source>Erbium</source>
         <translation type="unfinished">鉺</translation>
     </message>
     <message>
         <source>Thulium</source>
         <translation type="unfinished">銩</translation>
     </message>
     <message>
         <source>Ytterbium</source>
         <translation type="unfinished">鐿</translation>
     </message>
     <message>
         <source>Lutetium</source>
         <translation type="unfinished">鎦</translation>
     </message>
     <message>
         <source>Hafnium</source>
         <translation type="unfinished">鉿</translation>
     </message>
     <message>
         <source>Tantalum</source>
         <translation type="unfinished">鉭</translation>
     </message>
     <message>
         <source>Tungsten</source>
         <translation type="unfinished">鎢</translation>
     </message>
     <message>
         <source>Rhenium</source>
         <translation type="unfinished">錸</translation>
     </message>
     <message>
         <source>Osmium</source>
         <translation type="unfinished">鋨</translation>
     </message>
     <message>
         <source>Iridium</source>
         <translation type="unfinished">銥</translation>
     </message>
     <message>
         <source>Platinum</source>
         <translation type="unfinished">鉑</translation>
     </message>
     <message>
         <source>Gold</source>
         <translation type="unfinished">金</translation>
     </message>
     <message>
         <source>Mercury</source>
         <translation type="unfinished">汞</translation>
     </message>
     <message>
         <source>Thallium</source>
         <translation type="unfinished">鉈</translation>
     </message>
     <message>
         <source>Lead</source>
         <translation type="unfinished">鉛</translation>
     </message>
     <message>
         <source>Bismuth</source>
         <translation type="unfinished">鉍</translation>
     </message>
     <message>
         <source>Polonium</source>
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
@@ -1,97 +1,73 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CanvasCardWindow</name>
     <message>
         <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>
         <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>
         <source>Snap to position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Turn one card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Turn three cards</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,585 +1,414 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished">應用程式問題</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;%1 is not responding.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <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>
 <context>
     <name>FirstUse</name>
     <message>
         <source>&lt;&lt; Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next &gt;&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap anywhere on the screen to continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait, loading %1 settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finish</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputMethods</name>
     <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> - Launcher</source>
         <translation type="unfinished"> - 啟動器</translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished">無應用程式</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished">&lt;p&gt;沒有可開啟此文件的應用程式&lt;p&gt;Type is %1.</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished">文件</translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>Icon View</source>
         <translation type="unfinished">圖示瀏覽</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished">列表瀏覽</translation>
     </message>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
-        <source>%1 files</source>
-        <translation type="obsolete">%1 檔案</translation>
-    </message>
-    <message>
-        <source>All types of file</source>
-        <translation type="obsolete">所有類型檔案</translation>
-    </message>
-    <message>
         <source>Document View</source>
         <translation type="unfinished">文件瀏覽</translation>
     </message>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>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>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished">所有</translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished">圖形</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished">文字</translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished">影像</translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished">加入</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>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>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Server</name>
     <message>
         <source>USB Lock</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation type="unfinished">訊息</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>Battery level is critical!
-Keep power off until power restored!</source>
-        <translation type="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>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Critical Memory Shortage
 Please end this application
 immediately.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WARNING</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The battery is running very low. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The Back-up battery is very low&lt;p&gt;Please charge the back-up battery</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation type="unfinished">終止</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation type="unfinished">終止Opie</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation type="unfinished">重開機</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation type="unfinished">重新啟動Opie</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation type="unfinished">關機</translation>
     </message>
     <message>
-        <source>&lt;p&gt;
-These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
-        <translation type="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
@@ -1,396 +1,244 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoginBase</name>
     <message>
         <source>LoginBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you select this option, opie-login will automagically log you in with the user you have selected in the drop-down list.  
 
 For the Zaurus 5x00 this is always the user &quot;root&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This drop-down list allows you to select the user for auto-login
 (if enabled above).  
 
 You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MultiauthConfig</name>
     <message>
         <source>Security configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the order they will appear in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
         <source>Locking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></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-securityplugin-*&lt;/em&gt; package! Once you have done that, you will be able to configure your PDA protection here.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MultiauthGeneralConfig</name>
     <message>
         <source>When to lock Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on Opie start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on Opie resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Multiple plugins authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Required successes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Don&apos;t protect this config screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show explanatory screens</source>
         <translation type="unfinished"></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>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You must save your current settings before trying to authenticate. Press OK to accept and launch a simulated authentication process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you don&apos;t like the result of this test, don&apos;t forget to change your settings before you exit the configuration application!</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>
     </message>
     <message>
         <source>Select a net-range or enter a new one.  
 
 This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
 
 For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
 
 The entry &quot;All&quot; will allow *any* IP to connect. 
 The entry &quot;None&quot; will *deny* any connection.  
 
 If unsure, select &quot;Any&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the selected net range from the list
 
 If you press this button, the currently selected net range will be deleted from the list of net ranges.
 
 If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
 the list to the state it has been when you initially booted your Zaurus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button will restore the list of net ranges
 to the defaults.
 
 Beware that all manually entered net ranges will be lost!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select your sync software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Qtopia 1.7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie 1.0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IntelliSync</source>
         <translation type="unfinished"></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="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,50 +1,42 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>SnakeGame</name>
     <message>
         <source>Snake</source>
         <translation>貪食蛇</translation>
     </message>
     <message>
         <source>New Game</source>
         <translation>新遊戲</translation>
     </message>
     <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
@@ -1,395 +1,357 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tests</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSysInfo</name>
     <message>
         <source>CF</source>
         <translation type="unfinished">CF</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation type="unfinished">本圖表顯示CF記憶卡上已使用的記憶體量</translation>
     </message>
     <message>
         <source>Ha</source>
         <translation type="unfinished">Ha</translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation type="unfinished">本圖表顯示硬碟上已使用的儲存空間</translation>
     </message>
     <message>
         <source>SD</source>
         <translation type="unfinished">SD</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation type="unfinished">本圖表顯示SD記憶卡上已使用的記憶體量</translation>
     </message>
     <message>
         <source>SC</source>
         <translation type="unfinished">SC</translation>
     </message>
     <message>
         <source>In</source>
         <translation type="unfinished">In</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation type="unfinished">本圖表顯示內建記憶體中已使用的記憶體量</translation>
     </message>
     <message>
         <source>RA</source>
         <translation type="unfinished">RA</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation type="unfinished">本圖表顯示RAM disk上已使用的記憶體量</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>應用程式CPU使用率 (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>系統CPU使用率</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>型號</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>本頁顯示處理器資源消耗程度</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>已使用 (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>緩衝區 (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>快取區 (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>剩餘 (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>總記憶體： %1 kB</translation>
     </message>
     <message>
-        <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
-Memory is categorized as follows:
-
-1. Used - memory used to by Opie and any running applications.
-2. Buffers - temporary storage used to improve performance
-3. Cached - information that has recently been used, but has not been freed yet.
-4. Free - memory not currently used by Opie or any running applications.</source>
-        <translation type="obsolete">本頁顯示裝置些記憶體分配情形
-記憶體使用分類如下：
-
-1. 已使用 - 由Opie及執行的程式所佔用
-2. 緩衝區 - 用來提升系統效能的暫存區
-3. 快取區 - 最近使用過但尚未清除的資訊
-4. 剩餘 - 未被Opie或任何執行程式佔用的記憶體</translation>
-    </message>
-    <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>模組</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>大小</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Use#</translation>
     </message>
     <message>
-        <source>Used By</source>
-        <translation type="obsolete">使用者</translation>
-    </message>
-    <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>這是現在已載入系統的所有核心模組的清單
 
 點住模組名稱不放即可顯示詳細資訊或卸載該模組</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>從選單中選擇指令，再點右側的「送出」鈕即可送出命令給選取的模組</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>送出</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>點下此處即可送出命令給上方已選取的模組</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>本區顯示模組的詳細資訊</translation>
     </message>
     <message>
-        <source>You really want to execute
-</source>
-        <translation type="obsolete">您確定要執行？</translation>
-    </message>
-    <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>
         <source>Used (%1 kB)</source>
         <translation>已使用 (%1 kB)</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>尚餘 (%1 kB)</translation>
     </message>
     <message>
         <source> : %1 kB</source>
         <translation>: %1 Kb</translation>
     </message>
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>命令</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>狀態</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>時間</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation>這是裝置上所有執行中程序的清單
 
 點住程序名稱不放即可顯示詳細資訊或送訊號給它</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation>由選單中選擇一個訊號，並點下右側的「送出」鈕，即可送訊號給該程序</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>送出</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation>點此處以送出選定的訊號給選取的程序</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>本區顯示選取程序的詳細資料</translation>
     </message>
     <message>
-        <source>You really want to send
-</source>
-        <translation type="obsolete">您確定要送出？</translation>
-    </message>
-    <message>
         <source>Really want to send %1
 to this process?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>系統資訊</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>記憶體</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>儲存空間</translation>
     </message>
     <message>
         <source>CPU</source>
         <translation>中央處理器</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>程序</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>版本</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>模組</translation>
     </message>
     <message>
         <source>Benchmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syslog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Linux 核心&lt;/b&gt;&lt;p&gt;版本: </translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>編譯者：</translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;版本: </translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>建立日期</translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>&lt;p&gt;版本: </translation>
     </message>
     <message>
-        <source>&lt;p&gt;Model: </source>
-        <translation 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>
         <source>Built against Qt/E </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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,69 +1,58 @@
 <!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>
     <message>
         <source>TableViewer - Edit Keys</source>
         <translation>TableViewer - Edit Keys</translation>
     </message>
     <message>
         <source>Key Name</source>
         <translation>Key Name</translation>
     </message>
     <message>
         <source>Key Type</source>
         <translation>Key Type</translation>
     </message>
     <message>
         <source>New</source>
         <translation>新文件</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>刪除</translation>
     </message>
     <message>
         <source>Clear All</source>
         <translation>清除全部</translation>
     </message>
 </context>
 <context>
     <name>TVListView</name>
     <message>
         <source>List View</source>
         <translation>Table Viewer</translation>
     </message>
 </context>
 <context>
     <name>TableViewerWindow</name>
     <message>
         <source>Table Viewer</source>
         <translation>Table Viewer</translation>
     </message>
     <message>
         <source>could not load Document</source>
         <translation>無法開啟文件</translation>
     </message>
 </context>
 </TS>
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
@@ -1,278 +1,272 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>TextEdit</name>
     <message>
         <source>New</source>
         <translation>新文件</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>開啟</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>存檔</translation>
     </message>
     <message>
         <source>Save As</source>
         <translation>另存新檔</translation>
     </message>
     <message>
         <source>Cut</source>
         <translation>剪下</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>複製</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>貼上</translation>
     </message>
     <message>
         <source>Find...</source>
         <translation>尋找...</translation>
     </message>
     <message>
         <source>Zoom in</source>
         <translation>放大</translation>
     </message>
     <message>
         <source>Zoom out</source>
         <translation>縮小</translation>
     </message>
     <message>
         <source>Wrap lines</source>
         <translation>折回行列</translation>
     </message>
     <message>
         <source>Start with new file</source>
         <translation>開始新的檔案</translation>
     </message>
     <message>
         <source>File</source>
         <translation>檔案</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>編輯</translation>
     </message>
     <message>
         <source>View</source>
         <translation>觀看</translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation>尋找下一個</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>尋找最近的</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>刪除</translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation>文字編輯器</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>字形</translation>
     </message>
     <message>
         <source>.desktop File</source>
         <translation>.desktop File</translation>
     </message>
     <message>
         <source>Linked Document</source>
         <translation>Linked Document</translation>
     </message>
     <message>
         <source>All</source>
         <translation>全部</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>文字</translation>
     </message>
     <message>
         <source>Insert Time and Date</source>
         <translation></translation>
     </message>
     <message>
         <source>Advanced Features</source>
         <translation>進階選項</translation>
     </message>
     <message>
         <source>Prompt on Exit</source>
         <translation>Prompt on Exit</translation>
     </message>
     <message>
         <source>Always open linked file</source>
         <translation>總是開啟Linked檔案</translation>
     </message>
     <message>
         <source>File Permissions</source>
         <translation>檔案權限</translation>
     </message>
     <message>
         <source>Search Bar Open</source>
         <translation>開始Search Bar</translation>
     </message>
     <message>
         <source>Goto Line...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto Save 5 min.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor has detected&lt;BR&gt;you selected a &lt;B&gt;.desktop&lt;/B&gt;file.&lt;BR&gt;Open&lt;B&gt;.desktop&lt;/B&gt; file or &lt;B&gt;linked&lt;/B&gt; file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Edit</source>
         <translation type="unfinished">文字編輯</translation>
     </message>
     <message>
         <source>Write Failed</source>
         <translation type="unfinished">寫入錯誤</translation>
     </message>
     <message>
         <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>
         <source>Textedit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Textedit detected
 you have unsaved changes
 Go ahead and save?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Don&apos;t Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not enough lines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 - Text Editor</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="unfinished"></translation>
     </message>
     <message>
         <source>Save Failed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>設定檔案權限</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>設定檔案權限 :</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>擁有者</translation>
     </message>
     <message>
         <source>group</source>
         <translation>群組</translation>
     </message>
     <message>
         <source>others</source>
         <translation>其他</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>擁有者</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>群組</translation>
     </message>
     <message>
         <source>read</source>
         <translation>讀</translation>
     </message>
     <message>
         <source>write</source>
         <translation>寫</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>執行</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>警告</translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation>錯誤 - no user</translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation>錯誤 - no group</translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation>錯誤 setting ownership or group</translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation>錯誤  setting mode</translation>
     </message>
     <message>
         <source>File Permissions</source>
         <translation>檔案權限</translation>
     </message>
 </context>
 </TS>
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
@@ -1,190 +1,142 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <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>
         <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>
         <translation>今日</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
         <translation>Today By Maximilian Reiß</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>按此處啟動設定對話視窗</translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>載入及順序設定</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>上移</translation>
     </message>
     <message>
         <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
         <translation type="unfinished">打勾開啟喚醒時自動啟動「今日」功能</translation>
     </message>
     <message>
         <source>autostart on resume?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tiny banner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Have small banner </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
         <translation type="unfinished">休眠幾分鐘後才打開喚醒時自動啟動功能</translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation type="unfinished">休眠分鐘數</translation>
     </message>
     <message>
         <source> pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
         <translation type="unfinished">設定圖示的像素點數</translation>
     </message>
     <message>
         <source>icon size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> sec</source>
         <translation type="unfinished">秒</translation>
     </message>
     <message>
         <source>never</source>
         <translation type="unfinished">永不</translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
         <translation type="unfinished">「今日」多久自動更新一次內容</translation>
     </message>
     <message>
         <source>refresh</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,599 +1,535 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;h1&gt;Alarm at %1&lt;/h1&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished">未分類的</translation>
     </message>
 </context>
 <context>
     <name>NewTaskDlg</name>
     <message>
         <source>New Task</source>
         <translation type="unfinished">新增待辦事項</translation>
     </message>
     <message>
         <source>Blank task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Using template:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Alarms</source>
         <translation>鬧鈴</translation>
     </message>
     <message>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recurrence</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Task Editor</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie</name>
     <message>
         <source>Todo List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Task</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
         <translation>輸入新的待辦事項</translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation>編輯待辦事項</translation>
     </message>
     <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>
         <source>New Tasks</source>
         <translation type="unfinished">新增待辦事項</translation>
     </message>
     <message>
         <source>C.</source>
         <translation type="unfinished">完成</translation>
     </message>
     <message>
         <source>Priority</source>
         <translation type="unfinished">優先順序</translation>
     </message>
     <message>
         <source>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>
         <source>Remove</source>
         <translation type="unfinished">移除</translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">命名</translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation type="unfinished">新樣板 %1</translation>
     </message>
     <message>
         <source>Click here to set the priority of new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter description of new task here.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>More</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to enter additional information for new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to reset new task information.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data can not be edited, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data can&apos;t be edited, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>Table View</source>
         <translation>Table View</translation>
     </message>
     <message>
         <source>None</source>
         <translation>無</translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation>%1 天</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">編輯</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter brief description of the task here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Complete </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work on </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Buy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Organize </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plan </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Call </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select priority of task here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Very High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select category to organize this task with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recurring task</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information about this task here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation type="unfinished">待辦事項清單</translation>
     </message>
     <message>
         <source>Summary:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorStatus</name>
     <message>
         <source>Status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to set the current status of this task.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Started</source>
         <translation type="unfinished">已開始</translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation type="unfinished">已延期</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished">已完成</translation>
     </message>
     <message>
         <source>Not started</source>
         <translation type="unfinished">尚未開始</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select progress made on this task here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0 %</source>
         <translation type="unfinished">0 %</translation>
     </message>
     <message>
         <source>20 %</source>
         <translation type="unfinished">20 %</translation>
     </message>
     <message>
         <source>40 %</source>
         <translation type="unfinished">40 %</translation>
     </message>
     <message>
         <source>60 %</source>
         <translation type="unfinished">60 %</translation>
     </message>
     <message>
         <source>80 %</source>
         <translation type="unfinished">80 %</translation>
     </message>
     <message>
         <source>100 %</source>
         <translation type="unfinished">100 %</translation>
     </message>
     <message>
         <source>Start Date:</source>
         <translation type="unfinished">開始日期：</translation>
     </message>
     <message>
         <source>Click here to set the date this task was started.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Due Date:</source>
         <translation type="unfinished">預定到期日：</translation>
     </message>
     <message>
         <source>Click here to set the date this task needs to be completed by.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to mark this task as completed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to set the date this task was completed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintainer Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to set the maintainer&apos;s role.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nothing</source>
         <translation type="unfinished">無</translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation type="unfinished">由其負責</translation>
     </message>
     <message>
         <source>Done By</source>
         <translation type="unfinished">由其完成</translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation type="unfinished">由其協調</translation>
     </message>
     <message>
         <source>Maintainer:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is the name of the current task maintainer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>test</source>
         <translation type="unfinished">測試</translation>
     </message>
     <message>
         <source>Click here to select the task maintainer.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,35 +1,31 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GroupDialog</name>
     <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>
         <translation>編輯使用者</translation>
     </message>
 </context>
 </TS>
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,832 +1,566 @@
 <!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>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <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>
         <source>&amp;Import text file</source>
         <translation>Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
         <translation>Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
         <translation>&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation 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>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation 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>
         <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
         <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
         <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
         <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
         <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
         <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
         <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
         <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
         <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
         <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
         <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
         <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
         <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
         <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
         <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
         <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
-        <source>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>
         <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No document defined.
 You have to create a new document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to save </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 before continuing?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Now you have to enter
 a password twice for your
 newly created document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&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>
         <source>&lt;P&gt;You must create a new document first. Ok to create?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Password Manager&lt;br&gt;ZSafe version 2.1.2&lt;br&gt;&lt;/b&gt;by Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Translations by Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>